From 6f552ee0cb7ffba7bd44349737f55a161cfe01d0 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sat, 20 May 2023 14:36:47 +0300
Subject: [PATCH] some code cleanup

---
 .../HtmlDialogDownloaderFormatProvider.java   |  5 ++-
 .../messages/MessagesDownloader.java          | 31 +++++++++----------
 .../ru/vtosters/lite/hooks/PhotoViewer.java   |  2 +-
 .../vtosters/lite/music/LastFMScrobbler.java  |  2 +-
 .../vtosters/lite/themes/ThemesManager.java   |  2 +-
 .../lite/themes/loaders/ResourcesLoader.java  |  2 +-
 .../lite/translators/DeepLTranslator.java     |  2 +-
 .../lite/ui/dialogs/ServerDialog.java         |  2 +-
 .../vtosters/lite/ui/dialogs/Translate.java   |  2 +-
 .../lite/ui/fragments/ThemesFragment.java     |  2 +-
 .../vtosters/lite/utils/VTVerifications.java  |  2 +-
 11 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java b/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java
index 4b28b705d..b96fc1fed 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java
@@ -20,7 +20,6 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
 
     @Override
     public String provideDocumentStart(String dialogName, String date) {
-
         return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>"
                 + AndroidUtils.getString(R.string.chat_export_title)
                 + "</title><style>"
@@ -58,9 +57,9 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
         }
 
         String chatAction = (message.chat_action != null) ? getHtmlForChatAction(message.chat_action) : "";
-        String attaches = (message.attachments.size() > 0) ? "<p class=\"msg-attaches\">" + AndroidUtils.getString(R.string.attachments) + ": " + getHtmlForAttach(message.attachments) + "</p>" : "";
+        String attaches = (!message.attachments.isEmpty()) ? "<p class=\"msg-attaches\">" + AndroidUtils.getString(R.string.attachments) + ": " + getHtmlForAttach(message.attachments) + "</p>" : "";
         String reply = (message.reply_message != null) ? provideReply(message.reply_message) : "";
-        String fwdMessages = (message.fwd_messages.size() > 0) ? provideForwardMessages(message.fwd_messages) : "";
+        String fwdMessages = (!message.fwd_messages.isEmpty()) ? provideForwardMessages(message.fwd_messages) : "";
         String userLink = (user.isGroup ? "club" : "id") + user.id;
 
         return "<div class=\"vtex-milk-msg" + isOut + "\" id=\"" + message.id + "\">" +
diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/messages/MessagesDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/messages/MessagesDownloader.java
index 39b192e8b..fb516db25 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/messages/MessagesDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/messages/MessagesDownloader.java
@@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 public class MessagesDownloader {
@@ -48,7 +47,7 @@ public class MessagesDownloader {
 
         var answers = poll.optJSONArray("answers");
 
-        for (int i = 0; i < answers.length(); i++) {
+        for (int i = 0; i < (answers != null ? answers.length() : 0); i++) {
             var jsonObject = answers.optJSONObject(i);
             if (jsonObject != null)
                 pollHtml.append("<hr><p>")
@@ -73,23 +72,21 @@ public class MessagesDownloader {
     }
 
     public static String getVideoHtml(JSONObject files) throws JSONException {
-        if (files == null) return AndroidUtils.getString(R.string.chat_export_video_nolinks);
+        if (files == null || files.length() == 0) {
+            return AndroidUtils.getString(R.string.chat_export_video_nolinks);
+        }
 
-        Iterator<? extends String> keys = files.keys();
         StringBuilder videoHtml = new StringBuilder();
 
-        int i = 0;
-        while (keys.hasNext() && i < VIDEO_QUALITIES.length) {
-            var key = keys.next();
-            if (key.equals("mp4_" + VIDEO_QUALITIES[i])) {
+        for (int videoQuality : VIDEO_QUALITIES) {
+            String key = "mp4_" + videoQuality;
+            if (files.has(key)) {
                 videoHtml.append("<a class=\"msg-attach-link\" href=\"")
-                        .append(files.get(key))
+                        .append(files.getString(key))
                         .append("\">")
-                        .append(VIDEO_QUALITIES[i])
-                        .append("p</a>")
-                        .append(" ");
+                        .append(videoQuality)
+                        .append("p</a> ");
             }
-            ++i;
         }
 
         return videoHtml.toString();
@@ -111,12 +108,11 @@ public class MessagesDownloader {
         VtOkHttpClient.getInstance().a(req).a(new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("MessagesDownloader", String.valueOf(e));
+                Log.d("MessagesDownloader", e.getMessage());
             }
 
             @Override
-            public void a(Call call, Response response)
-                    throws IOException {
+            public void a(Call call, Response response) {
                 try {
                     JSONObject obj = new JSONObject(response.a().g()).getJSONObject("response");
 
@@ -145,8 +141,9 @@ public class MessagesDownloader {
     private List<MiniMsg> parseMessages(JSONArray jsonArray) throws JSONException {
         List<MiniMsg> thing = new ArrayList<>();
 
-        for (int i = 0; i < jsonArray.length(); i++)
+        for (int i = 0; i < jsonArray.length(); i++) {
             thing.add(new MiniMsg(jsonArray.getJSONObject(i)));
+        }
 
         return thing;
     }
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
index cb61c4b9d..24da27447 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
@@ -286,7 +286,7 @@ public class PhotoViewer {
         client.a(request).a(new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("PhotoViewer", String.valueOf(e));
+                Log.d("PhotoViewer", e.getMessage());
             }
 
             @Override
diff --git a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java
index e7e600b06..70c1cfc94 100644
--- a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java
+++ b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java
@@ -93,7 +93,7 @@ public class LastFMScrobbler {
         fetch(params, new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("Scrobbler", String.valueOf(e));
+                Log.d("Scrobbler", e.getMessage());
             }
 
             @Override
diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java
index 4aeb5236e..6c0a80fa2 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java
@@ -124,7 +124,7 @@ public class ThemesManager {
                 ResourcesLoader.load(app, modApk.getAbsolutePath(), false);
             }
         } catch (Exception e) {
-            Log.e("ThemesManager", String.valueOf(e));
+            Log.e("ThemesManager", e.getMessage());
         }
     }
 
diff --git a/app/src/main/java/ru/vtosters/lite/themes/loaders/ResourcesLoader.java b/app/src/main/java/ru/vtosters/lite/themes/loaders/ResourcesLoader.java
index 84df42503..95d6d5e3e 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/loaders/ResourcesLoader.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/loaders/ResourcesLoader.java
@@ -83,7 +83,7 @@ public class ResourcesLoader {
                 // Ignored.
             }
         } catch (Throwable e) {
-            Log.d("WTF", String.valueOf(e));
+            Log.d("WTF", e.getMessage());
         }
     }
 
diff --git a/app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java b/app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java
index 115760963..ff108db71 100644
--- a/app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java
+++ b/app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java
@@ -127,7 +127,7 @@ public class DeepLTranslator extends BaseTranslator {
 
             return text;
         } catch (Throwable e) {
-            Log.d("DeepL", String.valueOf(e));
+            Log.d("DeepL", e.getMessage());
         }
         return text;
     }
diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java
index 9a04483c7..2037c3c87 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java
@@ -41,7 +41,7 @@ public class ServerDialog {
             client.a(request).a(new Callback() {
                 @Override
                 public void a(Call call, IOException e) {
-                    Log.d(TAG, String.valueOf(e));
+                    Log.d(TAG, e.getMessage());
                     showAlert = false;
                 }
 
diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/Translate.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/Translate.java
index 2d5f2b421..11cde2874 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/Translate.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/Translate.java
@@ -30,7 +30,7 @@ public class Translate {
                 String translation = translator.getTranslation(text);
                 MAIN_EXECUTOR.execute(() -> showDialog(context, translation));
             } catch (Exception e) {
-                Log.e("Translate", String.valueOf(e));
+                Log.e("Translate", e.getMessage());
             }
         });
     }
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
index 16771c9e9..ae62f2f9e 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
@@ -215,7 +215,7 @@ public class ThemesFragment extends TrackedMaterialPreferenceToolbarFragment {
                     ThemesManager.generateModApk(color);
                     requireActivity().runOnUiThread(this::restart);
                 } catch (Throwable e) {
-                    Log.e("ThemesFragment", String.valueOf(e));
+                    Log.e("ThemesFragment", e.getMessage());
                     ThemesManager.deleteModification();
                     requireActivity().runOnUiThread(() -> {
                         dialog.dismiss();
diff --git a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java
index 2ed647272..935ec7dcc 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java
@@ -55,7 +55,7 @@ public class VTVerifications {
 
             @Override
             public void a(Call call, IOException e) {
-                Log.d("VTVerifications", String.valueOf(e));
+                Log.d("VTVerifications", e.getMessage());
             }
 
         });