From fc4e7fddbe6a820054c6be5a92f1f1666da79585 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 28 Dec 2022 15:01:25 +0100
Subject: [PATCH] Fix DeepL pro URL

---
 .../java/app/fedilab/android/activities/MediaActivity.java    | 2 --
 .../main/java/app/fedilab/android/helper/TranslateHelper.java | 4 +++-
 .../java/com/github/stom79/mytransl/translate/Helper.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
index 729d5c9d..66dcb5b9 100644
--- a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
@@ -27,7 +27,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.Log;
 import android.view.Display;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -256,7 +255,6 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
                         }
                     }
                 } else {
-                    Log.v(Helper.TAG, "ici");
                     if (attachment.type.compareTo("image") == 0) {
                         MediaHelper.manageMove(MediaActivity.this, attachment.url, false);
                     } else {
diff --git a/app/src/main/java/app/fedilab/android/helper/TranslateHelper.java b/app/src/main/java/app/fedilab/android/helper/TranslateHelper.java
index 2edbb8ac..2876feea 100644
--- a/app/src/main/java/app/fedilab/android/helper/TranslateHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/TranslateHelper.java
@@ -58,7 +58,9 @@ public class TranslateHelper {
             String translatorVersion = sharedpreferences.getString(context.getString(R.string.SET_TRANSLATOR_VERSION), "PRO");
             params.setPro(translatorVersion.equals("PRO"));
             String apikey = sharedpreferences.getString(context.getString(R.string.SET_TRANSLATOR_API_KEY), null);
-            myTransL.setDeeplAPIKey(apikey.trim());
+            if (apikey != null) {
+                myTransL.setDeeplAPIKey(apikey.trim());
+            }
         }
 
         String translate = sharedpreferences.getString(context.getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
diff --git a/mytransl/src/main/java/com/github/stom79/mytransl/translate/Helper.java b/mytransl/src/main/java/com/github/stom79/mytransl/translate/Helper.java
index 2b27c86b..5376d3cf 100644
--- a/mytransl/src/main/java/com/github/stom79/mytransl/translate/Helper.java
+++ b/mytransl/src/main/java/com/github/stom79/mytransl/translate/Helper.java
@@ -28,7 +28,7 @@ public class Helper {
 
 
     private static final String YANDEX_BASE_URL = "https://translate.yandex.net/api/v1.5/tr.json/translate?";
-    private static final String DEEPL_BASE_URL = "https://free.deepl.com/v2/translate?";
+    private static final String DEEPL_BASE_URL = "https://api.deepl.com/v2/translate?";
     private static final String DEEPL_BASE_FREE_URL = "https://api-free.deepl.com/v2/translate?";
     private static final String SYSTRAN_BASE_URL = "https://api-platform.systran.net/translation/text/translate?";
     private static final String[] deeplAvailableLang = {"EN", "DE", "FR", "ES", "IT", "NL", "PL"};