Some cleaning

30 files changed, 297 insertions, 318 deletions

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index ecfd4c635..dff1f87b1 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -165,6 +165,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public abstract class BaseMainActivity extends BaseActivity implements NetworkStateReceiver.NetworkStateReceiverListener, FragmentMastodonTimeline.UpdateCounters, FragmentNotificationContainer.UpdateCounters, FragmentMastodonConversation.UpdateCounters {
 
+    private static final int REQUEST_CODE = 5415;
     public static String currentInstance, currentToken, currentUserID, client_id, client_secret, software;
     public static HashMap<String, List<Emoji>> emojis = new HashMap<>();
     public static Account.API api;
@@ -297,7 +298,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
     };
     private NetworkStateReceiver networkStateReceiver;
     private boolean headerMenuOpen;
-    private static final int REQUEST_CODE = 5415;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -786,7 +786,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         });
 
 
-
         binding.toolbarSearch.setOnSearchClickListener(v -> binding.tabLayout.setVisibility(View.VISIBLE));
         //For receiving  data from other activities
         LocalBroadcastManager.getInstance(BaseMainActivity.this).registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));
@@ -1042,7 +1041,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                                                     String title = "";
                                                     String description = "";
 
-                                                    if(titleEl != null) {
+                                                    if (titleEl != null) {
                                                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                                                             title = Html.fromHtml(titleEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
                                                         } else {
@@ -1050,7 +1049,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                                                         }
                                                     }
 
-                                                    if(descriptionEl != null) {
+                                                    if (descriptionEl != null) {
                                                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                                                             description = Html.fromHtml(descriptionEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
                                                         } else {
@@ -1059,13 +1058,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                                                     }
 
                                                     String imageUrl = "";
-                                                    if(imageUrlEl != null) {
+                                                    if (imageUrlEl != null) {
                                                         imageUrl = imageUrlEl.attr("content");
                                                     }
 
                                                     StringBuilder titleBuilder = new StringBuilder();
 
-                                                    if(!originalUrl.trim().equalsIgnoreCase(sharedText.trim())) {
+                                                    if (!originalUrl.trim().equalsIgnoreCase(sharedText.trim())) {
                                                         // If the shared text is not just the URL, add it to the top
                                                         String toAppend = sharedText.replaceAll("\\s*" + Pattern.quote(originalUrl) + "\\s*", "");
                                                         titleBuilder.append(toAppend);
@@ -1073,7 +1072,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
 
                                                     if (title.length() > 0) {
                                                         // OG title fetched from source
-                                                        if(titleBuilder.length() > 0) titleBuilder.append("\n\n");
+                                                        if (titleBuilder.length() > 0)
+                                                            titleBuilder.append("\n\n");
                                                         titleBuilder.append(title);
                                                     }
 
diff --git a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
index 03fda1b7f..384a76980 100644
--- a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
@@ -320,6 +320,7 @@ public class AccountReportActivity extends BaseBarActivity {
         }
 
     }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
index 5ff370bac..622c3677a 100644
--- a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
@@ -107,11 +107,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
     private Status statusReply, statusMention, statusQuoted;
     private StatusDraft statusDraft;
     private ComposeAdapter composeAdapter;
-    private boolean promptSaveDraft;
-    private boolean restoredDraft;
-    private List<Attachment> sharedAttachments;
-
-
     private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(android.content.Context context, Intent intent) {
@@ -138,7 +133,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             }
         }
     };
-
+    private boolean promptSaveDraft;
+    private boolean restoredDraft;
+    private List<Attachment> sharedAttachments;
     private ActivityPaginationBinding binding;
     private BaseAccount account;
     private String instance, token;
diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
index 97b13d769..1edb53858 100644
--- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
@@ -117,8 +117,6 @@ public class ProfileActivity extends BaseActivity {
     private String mention_str;
     private WellKnownNodeinfo.NodeInfo nodeInfo;
     private boolean checkRemotely;
-    private boolean homeMuted;
-
     private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -133,6 +131,7 @@ public class ProfileActivity extends BaseActivity {
             }
         }
     };
+    private boolean homeMuted;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/Account.java b/app/src/main/java/app/fedilab/android/client/entities/api/Account.java
index 6631be8fd..36667aa8c 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/api/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/api/Account.java
@@ -87,28 +87,6 @@ public class Account implements Serializable {
     public Account moved;
     @SerializedName("role")
     public Role role;
-
-
-    public static class Role implements Serializable {
-        @SerializedName("id")
-        public String id;
-        @SerializedName("name")
-        public String name;
-        @SerializedName("color")
-        public String color;
-        @SerializedName("position")
-        public int position;
-        @SerializedName("permissions")
-        public int permissions;
-        @SerializedName("highlighted")
-        public boolean highlighted;
-        @SerializedName("created_at")
-        public Date created_at;
-        @SerializedName("updated_at")
-        public Date updated_at;
-    }
-
-
     public transient RelationShip relationShip;
 
     public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) {
@@ -133,6 +111,34 @@ public class Account implements Serializable {
         return SpannableHelper.convert(context, note, null, this, null, viewWeakReference);
     }
 
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        boolean same = false;
+        if (obj instanceof Account) {
+            same = this.id.equals(((Account) obj).id);
+        }
+        return same;
+    }
+
+    public static class Role implements Serializable {
+        @SerializedName("id")
+        public String id;
+        @SerializedName("name")
+        public String name;
+        @SerializedName("color")
+        public String color;
+        @SerializedName("position")
+        public int position;
+        @SerializedName("permissions")
+        public int permissions;
+        @SerializedName("highlighted")
+        public boolean highlighted;
+        @SerializedName("created_at")
+        public Date created_at;
+        @SerializedName("updated_at")
+        public Date updated_at;
+    }
+
     public static class AccountParams implements Serializable {
         @SerializedName("discoverable")
         public boolean discoverable;
@@ -150,14 +156,4 @@ public class Account implements Serializable {
         public LinkedHashMap<Integer, Field.FieldParams> fields;
 
     }
-
-
-    @Override
-    public boolean equals(@Nullable Object obj) {
-        boolean same = false;
-        if (obj instanceof Account) {
-            same = this.id.equals(((Account) obj).id);
-        }
-        return same;
-    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/Status.java b/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
index ecc2a07ed..994a0d39b 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
@@ -153,10 +153,6 @@ public class Status implements Serializable, Cloneable {
         return contentTranslateSpan;
     }
 
-    public interface Callback {
-        void emojiFetched();
-    }
-
     @NonNull
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
@@ -167,4 +163,8 @@ public class Status implements Serializable, Cloneable {
         BOTTOM
     }
 
+    public interface Callback {
+        void emojiFetched();
+    }
+
 }
diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java b/app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java
index 26eb86a75..070f91e3b 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java
@@ -25,16 +25,6 @@ import app.fedilab.android.client.entities.api.Account;
 
 public class AdminAccount implements Serializable {
 
-    @SerializedName("id")
-    public String id;
-    @SerializedName("username")
-    public String username;
-    @SerializedName("domain")
-    public String domain;
-    @SerializedName("created_at")
-    public Date created_at;
-    @SerializedName("email")
-    public String email;
     public static LinkedHashMap<Integer, String> permissions;
 
     static {
@@ -61,6 +51,16 @@ public class AdminAccount implements Serializable {
         permissions.put(80000, "Delete User Data");
     }
 
+    @SerializedName("id")
+    public String id;
+    @SerializedName("username")
+    public String username;
+    @SerializedName("domain")
+    public String domain;
+    @SerializedName("created_at")
+    public Date created_at;
+    @SerializedName("email")
+    public String email;
     @SerializedName("ip")
     public String ip;
     @SerializedName("role")
diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java b/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
index 626722580..d60a72ed1 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
@@ -509,7 +509,7 @@ public class StatusCache {
         try {
             db.delete(Sqlite.TABLE_STATUS_CACHE,
                     Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_INSTANCE + " =? AND " + Sqlite.COL_STATUS + " LIKE ?",
-                    new String[]{userid, instance, "%\"id\":\"" + targetedUser + "\"%" });
+                    new String[]{userid, instance, "%\"id\":\"" + targetedUser + "\"%"});
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 5af0b7272..f8c588199 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1965,6 +1965,20 @@ public class Helper {
         return R.style.AppTheme;
     }
 
+    public static void addMutedAccount(app.fedilab.android.client.entities.api.Account target) {
+        if (MainActivity.filteredAccounts == null) {
+            MainActivity.filteredAccounts = new ArrayList<>();
+        }
+        if (!MainActivity.filteredAccounts.contains(target)) {
+            MainActivity.filteredAccounts.add(target);
+        }
+    }
+
+    public static void removeMutedAccount(app.fedilab.android.client.entities.api.Account target) {
+        if (MainActivity.filteredAccounts != null) {
+            MainActivity.filteredAccounts.remove(target);
+        }
+    }
 
     //Enum that described actions to replace inside a toot content
     public enum PatternType {
@@ -1996,19 +2010,4 @@ public class Helper {
     public interface OnFileCopied {
         void onFileCopied(File file);
     }
-
-    public static void addMutedAccount(app.fedilab.android.client.entities.api.Account target) {
-        if (MainActivity.filteredAccounts == null) {
-            MainActivity.filteredAccounts = new ArrayList<>();
-        }
-        if (!MainActivity.filteredAccounts.contains(target)) {
-            MainActivity.filteredAccounts.add(target);
-        }
-    }
-
-    public static void removeMutedAccount(app.fedilab.android.client.entities.api.Account target) {
-        if (MainActivity.filteredAccounts != null) {
-            MainActivity.filteredAccounts.remove(target);
-        }
-    }
 }
diff --git a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
index 352075b65..770436b5f 100644
--- a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java
@@ -409,15 +409,6 @@ public class MediaHelper {
         return maxHeight;
     }
 
-    //Listener for recording media
-    public interface ActionRecord {
-        void onRecorded(String file);
-    }
-
-    public interface OnSchedule {
-        void scheduledAt(String scheduledDate);
-    }
-
     public static void ResizedImageRequestBody(Context context, Uri uri, File targetedFile) {
         InputStream decodeBitmapInputStream = null;
         try {
@@ -529,7 +520,6 @@ public class MediaHelper {
         }
     }
 
-
     private static long getMaxSize(long maxSize) {
         if (MainActivity.instanceInfo != null && MainActivity.instanceInfo.configuration != null && MainActivity.instanceInfo.configuration.media_attachments != null) {
             maxSize = MainActivity.instanceInfo.configuration.media_attachments.image_size_limit;
@@ -584,4 +574,14 @@ public class MediaHelper {
         return null;
     }
 
+
+    //Listener for recording media
+    public interface ActionRecord {
+        void onRecorded(String file);
+    }
+
+    public interface OnSchedule {
+        void scheduledAt(String scheduledDate);
+    }
+
 }
diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index 9457b9c5d..125212d38 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -98,7 +98,6 @@ public class PinnedTimelineHelper {
     }
 
 
-
     public synchronized static void redrawTopBarPinned(BaseMainActivity activity, ActivityMainBinding activityMainBinding, Pinned pinned, BottomMenu bottomMenu, List<MastodonList> mastodonLists) {
         //Values must be initialized if there is no records in db
         if (pinned == null) {
diff --git a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
index 2e3ba27a1..f27a35939 100644
--- a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
@@ -88,16 +88,13 @@ import es.dmoral.toasty.Toasty;
 public class SpannableHelper {
 
     public static final String CLICKABLE_SPAN = "CLICKABLE_SPAN";
+    private static int linkColor;
 
     public static Spannable convert(Context context, String text,
                                     Status status, Account account, Announcement announcement, WeakReference<View> viewWeakReference) {
         return convert(context, text, status, account, announcement, viewWeakReference, null);
     }
 
-
-    private static int linkColor;
-
-
     public static Spannable convert(Context context, String text,
                                     Status status, Account account, Announcement announcement,
                                     WeakReference<View> viewWeakReference, Status.Callback callback) {
@@ -613,7 +610,6 @@ public class SpannableHelper {
     }
 
 
-
     /**
      * Remove extra carriage returns at the bottom due to <p> tags in toots
      *
diff --git a/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java
index 15fd4b083..46223b1a1 100644
--- a/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java
@@ -70,7 +70,6 @@ public class ThemeHelper {
     }
 
 
-
     /**
      * Animate two views, the current view will be hidden to left
      *
@@ -230,7 +229,6 @@ public class ThemeHelper {
     }
 
 
-
     /**
      * Allow to set colors for having description on media
      *
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/EditImageActivity.java b/app/src/main/java/app/fedilab/android/imageeditor/EditImageActivity.java
index f0d5ea6ba..6433e0158 100644
--- a/app/src/main/java/app/fedilab/android/imageeditor/EditImageActivity.java
+++ b/app/src/main/java/app/fedilab/android/imageeditor/EditImageActivity.java
@@ -71,6 +71,8 @@ public class EditImageActivity extends BaseActivity implements OnPhotoEditorList
     private final ConstraintSet mConstraintSet = new ConstraintSet();
     PhotoEditor mPhotoEditor;
     String path;
+    CropImageContractOptions cropImageContractOptions;
+    ActivityResultLauncher<CropImageContractOptions> cropImageContractOptionsActivityResultLauncher;
     private PropertiesBSFragment mPropertiesBSFragment;
     private ShapeBSFragment mShapeBSFragment;
     private ShapeBuilder mShapeBuilder;
@@ -79,8 +81,6 @@ public class EditImageActivity extends BaseActivity implements OnPhotoEditorList
     private Uri uri;
     private boolean exit;
     private ActivityEditImageBinding binding;
-    CropImageContractOptions cropImageContractOptions;
-    ActivityResultLauncher<CropImageContractOptions> cropImageContractOptionsActivityResultLauncher;
 
     private static int exifToDegrees(int exifOrientation) {
         if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_90) {
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java
index 3ccea89d7..9faa16bc1 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java
@@ -56,8 +56,8 @@ import es.dmoral.toasty.Toasty;
 public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private final List<Account> accountList;
-    private Context context;
     private final boolean home_mute;
+    private Context context;
 
     public AccountAdapter(List<Account> accountList, boolean home_mute) {
         this.accountList = accountList;
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index 0a6b23bac..dcfc31473 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -150,6 +150,30 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             "..--..", ".-.-.-", ".----.", "-.-.--", "-..-.", "-.--.", "-.--.-", ".-...", "---...", "-.-.-.", "-...-", ".-.-.", "-....-", "..--.-",
             ".-..-.", "...-..-", ".--.-.", "..-.-", "--...-"
     };
+    public static int currentCursorPosition;
+    private final List<Status> statusList;
+    private final int TYPE_NORMAL = 0;
+    private final BaseAccount account;
+    private final String visibility;
+    private final app.fedilab.android.client.entities.api.Account mentionedAccount;
+    private final String editMessageId;
+    public ManageDrafts manageDrafts;
+    public promptDraftListener promptDraftListener;
+    private int statusCount;
+    private Context context;
+    private AlertDialog alertDialogEmoji;
+    private List<Emoji> emojisList = new ArrayList<>();
+    private boolean unlisted_changed = false;
+
+    public ComposeAdapter(List<Status> statusList, int statusCount, BaseAccount account, app.fedilab.android.client.entities.api.Account mentionedAccount, String visibility, String editMessageId) {
+        this.statusList = statusList;
+        this.statusCount = statusCount;
+        this.account = account;
+        this.mentionedAccount = mentionedAccount;
+        this.visibility = visibility;
+        this.editMessageId = editMessageId;
+
+    }
 
     public static int countMorseChar(String content) {
         int count_char = 0;
@@ -180,29 +204,34 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         return morseContent;
     }
 
-    private final List<Status> statusList;
-    private final int TYPE_NORMAL = 0;
-    private final BaseAccount account;
-    private final String visibility;
-    private final app.fedilab.android.client.entities.api.Account mentionedAccount;
-    private final String editMessageId;
-    public ManageDrafts manageDrafts;
-    private int statusCount;
-    private Context context;
-    private AlertDialog alertDialogEmoji;
-    private List<Emoji> emojisList = new ArrayList<>();
-    public promptDraftListener promptDraftListener;
-    private boolean unlisted_changed = false;
-    public static int currentCursorPosition;
+    private static void updateCharacterCount(ComposeViewHolder composeViewHolder) {
+        int charCount = MastodonHelper.countLength(composeViewHolder);
+        composeViewHolder.binding.characterCount.setText(String.valueOf(charCount));
+        composeViewHolder.binding.characterProgress.setProgress(charCount);
 
-    public ComposeAdapter(List<Status> statusList, int statusCount, BaseAccount account, app.fedilab.android.client.entities.api.Account mentionedAccount, String visibility, String editMessageId) {
-        this.statusList = statusList;
-        this.statusCount = statusCount;
-        this.account = account;
-        this.mentionedAccount = mentionedAccount;
-        this.visibility = visibility;
-        this.editMessageId = editMessageId;
+    }
+
+    public static StatusDraft prepareDraft(List<Status> statusList, ComposeAdapter composeAdapter, String instance, String user_id) {
+        //Collect all statusCompose
+        List<Status> statusDrafts = new ArrayList<>();
+        List<Status> statusReplies = new ArrayList<>();
+        int i = 0;
+        for (Status status : statusList) {
 
+            //Statuses must be sent
+            if (composeAdapter.getItemViewType(i) == TYPE_COMPOSE) {
+                statusDrafts.add(status);
+            } else {
+                statusReplies.add(status);
+            }
+            i++;
+        }
+        StatusDraft statusDraftDB = new StatusDraft();
+        statusDraftDB.statusReplyList = statusReplies;
+        statusDraftDB.statusDraftList = statusDrafts;
+        statusDraftDB.instance = instance;
+        statusDraftDB.user_id = user_id;
+        ret