Clean code

27 files changed, 102 insertions, 121 deletions

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 025814b15..2c2c531db 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -212,6 +212,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
     public static String regex_home, regex_local, regex_public;
     public static BaseAccount currentAccount;
     public static iconLauncher mLauncher = iconLauncher.BUBBLES;
+    public static boolean headerMenuOpen;
     Fragment currentFragment;
     private AppBarConfiguration mAppBarConfiguration;
     private ActivityMainBinding binding;
@@ -330,7 +331,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         }
     };
     private NetworkStateReceiver networkStateReceiver;
-    public static boolean headerMenuOpen;
 
     public static void fetchRecentAccounts(Activity activity, NavHeaderMainBinding headerMainBinding) {
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
@@ -644,8 +644,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         popup.show();
     }
 
-    protected abstract void rateThisApp();
-
     /**
      * Open notifications tab when coming from a notification device
      *
@@ -1034,6 +1032,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         intent.setFlags(0);
     }
 
+    protected abstract void rateThisApp();
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java
index 8b52a4603..b5e3b3e53 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java
@@ -404,12 +404,21 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
         }).start();
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
     public enum range {
         ALL,
         DAY
     }
 
-
     public static class GraphElement {
         String dateLabel;
         int count;
@@ -424,15 +433,6 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
         }
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     public class CustomMarkerView extends MarkerView {
 
         private final TextView tvContent;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt b/app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt
index 54241f999..a0290ba90 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt
@@ -79,34 +79,34 @@ class InstanceHealthActivity : DialogFragment() {
                     }
                     binding.name.text = instance.name
                     if (instance.up) {
-                        binding.up.setText(app.fedilab.android.R.string.is_up)
+                        binding.up.setText(R.string.is_up)
                         binding.up.setTextColor(
                             ThemeHelper.getAttColor(
                                 requireContext(),
-                                app.fedilab.android.R.attr.colorPrimary
+                                R.attr.colorPrimary
                             )
                         )
                     } else {
-                        binding.up.setText(app.fedilab.android.R.string.is_down)
+                        binding.up.setText(R.string.is_down)
                         binding.up.setTextColor(
                             ThemeHelper.getAttColor(
                                 requireContext(),
-                                app.fedilab.android.R.attr.colorError
+                                R.attr.colorError
                             )
                         )
                     }
                     binding.uptime.text = getString(
-                        app.fedilab.android.R.string.instance_health_uptime,
+                        R.string.instance_health_uptime,
                         instance.uptime * 100
                     )
                     if (instance.checked_at != null)
                         binding.checkedAt.text =
                             getString(
-                                app.fedilab.android.R.string.instance_health_checkedat,
+                                R.string.instance_health_checkedat,
                                 Helper.dateToString(instance.checked_at)
                             )
                     binding.values.text = getString(
-                        app.fedilab.android.R.string.instance_health_indication,
+                        R.string.instance_health_indication,
                         instance.version,
                         Helper.withSuffix(instance.active_users.toLong()),
                         Helper.withSuffix(instance.statuses.toLong())
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java
index 8eb71b195..a5cf710d5 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java
@@ -373,7 +373,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
                                                                                 Intent intentBD = new Intent(Helper.BROADCAST_DATA);
                                                                                 intentBD.putExtras(b);
                                                                                 LocalBroadcastManager.getInstance(MastodonListActivity.this).sendBroadcast(intentBD);
-                                                                            } catch (DBException e) {
+                                                                            } catch (
+                                                                                    DBException e) {
                                                                                 e.printStackTrace();
                                                                             }
                                                                         }).start();
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
index cbcb540c2..06be2592d 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
@@ -67,10 +67,10 @@ import es.dmoral.toasty.Toasty;
 public class SearchResultTabActivity extends BaseBarActivity {
 
 
+    public Boolean tagEmpty, accountEmpty;
     private String search;
     private ActivitySearchResultTabsBinding binding;
     private TabLayout.Tab initial;
-    public Boolean tagEmpty, accountEmpty;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/lemmy/LemmyPost.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/lemmy/LemmyPost.java
index 122e6e3bc..ce42efd44 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/lemmy/LemmyPost.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/lemmy/LemmyPost.java
@@ -48,16 +48,6 @@ public class LemmyPost implements Serializable {
     @SerializedName("unread_comments")
     public int unread_comments;
 
-    public static class LemmyPosts {
-        @SerializedName("posts")
-        public List<LemmyPost> posts;
-    }
-
-    public static class LemmyComments {
-        @SerializedName("comments")
-        public List<LemmyPost> comments;
-    }
-
     public static Status convert(LemmyPost lemmyPost, String instance) {
         Status status = new Status();
         status.id = lemmyPost.comment == null ? lemmyPost.post.id : lemmyPost.comment.id;
@@ -109,6 +99,16 @@ public class LemmyPost implements Serializable {
         return status;
     }
 
+    public static class LemmyPosts {
+        @SerializedName("posts")
+        public List<LemmyPost> posts;
+    }
+
+    public static class LemmyComments {
+        @SerializedName("comments")
+        public List<LemmyPost> comments;
+    }
+
     public static class Post implements Serializable {
         @SerializedName("id")
         public String id;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/CustomEmoji.java b/app/src/main/java/app/fedilab/android/mastodon/helper/CustomEmoji.java
index 9e99a567f..707bb3097 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/CustomEmoji.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/CustomEmoji.java
@@ -30,8 +30,8 @@ import app.fedilab.android.mastodon.client.entities.api.Status;
 
 
 public class CustomEmoji extends ReplacementSpan {
-    private float scale;
     private final WeakReference<View> viewWeakReference;
+    private float scale;
     private Drawable imageDrawable;
     private boolean callbackCalled;
 
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/ECDHFedilab.java b/app/src/main/java/app/fedilab/android/mastodon/helper/ECDHFedilab.java
index b31b931ea..bb8a06f93 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/ECDHFedilab.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/ECDHFedilab.java
@@ -192,7 +192,9 @@ public class ECDHFedilab {
             cipher.init(Cipher.DECRYPT_MODE, aesKey, gCMParameterSpec);
             byte[] decrypted = cipher.doFinal(ciphertext);
             decryptedStr = new String(decrypted, 2, decrypted.length - 2, StandardCharsets.UTF_8);
-        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidAlgorithmParameterException | InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) {
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException |
+                 InvalidAlgorithmParameterException | InvalidKeyException | BadPaddingException |
+                 IllegalBlockSizeException e) {
             e.printStackTrace();
             return null;
         }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
index bd9b1e40f..a8933c420 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
@@ -467,7 +467,6 @@ public class Helper {
     }
 
 
-
     /***
      *  Check if the user is connected to Internet
      * @return boolean
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 7c96b4c0a..541242a01 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -133,8 +133,8 @@ import es.dmoral.toasty.Toasty;
 
 
 public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private static final int searchDeep = 15;
     public static final int TYPE_COMPOSE = 1;
+    private static final int searchDeep = 15;
     public static boolean autocomplete = false;
     public static String[] ALPHA = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r",
             "s", "t", "u", "v", "w", "x", "y", "z", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "!", ",", "?",
@@ -985,7 +985,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             contentBuilder.append(subject);
         }
 
-        if(contentBuilder.length() > 0) {
+        if (contentBuilder.length() > 0) {
             contentBuilder.append("\n\n");
         }
 
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 02a15b55b..d31ce7ea1 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -190,10 +190,10 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     private final List<Status> statusList;
     private final boolean minified;
     private final Timeline.TimeLineEnum timelineType;
-    public RemoteInstance.InstanceType type;
-    public PinnedTimeline pinnedTimeline;
     private final boolean canBeFederated;
     private final boolean checkRemotely;
+    public RemoteInstance.InstanceType type;
+    public PinnedTimeline pinnedTimeline;
     public FetchMoreCallBack fetchMoreCallBack;
     private Context context;
     private boolean visiblePixelfed;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
index 3f5a5d6e9..0868fa18d 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java
@@ -87,22 +87,15 @@ import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
 
 public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
+    private static float measuredWidth = -1;
     private final List<Status> statusList;
     private Context context;
     private RecyclerView mRecyclerView;
-    private static float measuredWidth = -1;
+
     public StatusDirectMessageAdapter(List<Status> data) {
         this.statusList = data;
     }
 
-    @NotNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
-        context = parent.getContext();
-        DrawerStatusChatBinding itemBinding = DrawerStatusChatBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
-        return new StatusChatViewHolder(itemBinding);
-    }
-
     public static void loadAndAddAttachment(Context context, LayoutMediaBinding layoutMediaBinding,
                                             StatusChatViewHolder holder,
                                             RecyclerView.Adapter<RecyclerView.ViewHolder> adapter,
@@ -214,6 +207,14 @@ public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerVie
 
     }
 
+    @NotNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        DrawerStatusChatBinding itemBinding = DrawerStatusChatBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new StatusChatViewHolder(itemBinding);
+    }
+
     @Override
     public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
         super.onAttachedToRecyclerView(recyclerView);
@@ -227,15 +228,6 @@ public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerVie
         return statusList.size();
     }
 
-    public static class StatusChatViewHolder extends RecyclerView.ViewHolder {
-        DrawerStatusChatBinding binding;
-
-        StatusChatViewHolder(DrawerStatusChatBinding itemView) {
-            super(itemView.getRoot());
-            binding = itemView;
-        }
-    }
-
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
 
@@ -675,4 +667,13 @@ public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerVie
             holder.binding.media.mediaContainer.setVisibility(View.GONE);
         }
     }
+
+    public static class StatusChatViewHolder extends RecyclerView.ViewHolder {
+        DrawerStatusChatBinding binding;
+
+        StatusChatViewHolder(DrawerStatusChatBinding itemView) {
+            super(itemView.getRoot());
+            binding = itemView;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java
index 262c08734..a25df4b29 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java
@@ -43,6 +43,7 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
 
 
     boolean prefChanged = false;
+
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
         createPref();
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java
index 803835061..f609a8e35 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java
@@ -108,7 +108,7 @@ public class FragmentMastodonDirectMessage extends Fragment {
     private Status firstStatus;
     private boolean pullToRefresh;
     private String user_token, user_instance;
-
+    private Status statusCompose;
     private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
         @Override
         public void onReceive(android.content.Context context, Intent intent) {
@@ -126,7 +126,6 @@ public class FragmentMastodonDirectMessage extends Fragment {
             }
         }
     };
-    private Status statusCompose;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java
index d8f5bc3b6..2a5920f18 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java
@@ -65,6 +65,9 @@ public class FragmentMastodonNotification extends Fragment implements Notificati
     private boolean flagLoading;
     private List<Notification> notificationList;
     private NotificationAdapter notificationAdapter;
+    private boolean isViewInitialized;
+    private Notifications initialNotifications;
+    private String max_id, min_id, min_id_fetch_more, max_id_fetch_more;
     private final BroadcastReceiver receive_action = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -108,9 +111,6 @@ public class FragmentMastodonNotification extends Fragment implements Notificati
             }
         }
     };
-    private boolean isViewInitialized;
-    private Notifications initialNotifications;
-    private String max_id, min_id, min_id_fetch_more, max_id_fetch_more;
     private LinearLayoutManager mLayoutManager;
     private NotificationTypeEnum notificationType;
     private boolean aggregateNotification;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
index 1ecada156..fcc6049ca 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -73,9 +73,9 @@ import es.dmoral.toasty.Toasty;
 
 public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.FetchMoreCallBack {
 
-    private boolean scrollingUp;
     private static final int PRELOAD_AHEAD_ITEMS = 10;
     public UpdateCounters update;
+    private boolean scrollingUp;
     private FragmentPaginationBinding binding;
     private TimelinesVM timelinesVM;
     private AccountsVM accountsVM;
@@ -87,10 +87,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
     private StatusAdapter statusAdapter;
     private Timeline.TimeLineEnum timelineType;
     private List<Status> timelineStatuses;
-
-    private boolean retry_for_home_done;
-    private String lemmy_post_id;
-
     //Handle actions that can be done in other fragments
     private final BroadcastReceiver receive_action = new BroadcastReceiver() {
         @Override
@@ -180,6 +176,8 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
             }
         }
     };
+    private boolean retry_for_home_done;
+    private String lemmy_post_id;
     private boolean checkRemotely;
     private String accountIDInRemoteInstance;
     private boolean isViewInitialized;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentNotificationContainer.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentNotificationContainer.java
index 437d19e10..fa5736bd8 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentNotificationContainer.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentNotificationContainer.java
@@ -91,8 +91,6 @@ public class FragmentNotificationContainer extends Fragment {
             dialogBuilder.setView(dialogView.getRoot());
 
 
-
-
             boolean displayAllCategory = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_ALL_NOTIFICATIONS_TYPE) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, false);
             dialogView.displayAllCategories.setChecked(displayAllCategory);
             dialogView.displayAllCategories.setOnCheckedChangeListener((compoundButton, checked) -> {
diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java
index f5d6ef4a0..076ca8307 100644
--- a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java
@@ -205,6 +205,8 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
     private boolean isShowingTrackSelectionDialog;
     private Status status;
     private int flags;
+    private boolean humanInteraction;
+
     public static void hideKeyboard(Activity activity) {
         if (activity != null && activity.getWindow() != null) {
             activity.getWindow().getDecorView();
@@ -215,8 +217,6 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
         }
     }
 
-    private boolean humanInteraction;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/ShowAccountActivity.java
index 4b7b9e810..ace984dd3 100644
--- a/app/src/main/java/app/fedilab/android/peertube/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/android/peertube/activities/ShowAccountActivity.java
@@ -88,7 +88,6 @@ public class ShowAccountActivity extends BaseBarActivity {
         }
 
 
-
         manageAccount();
         AccountsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(AccountsVM.class);
         viewModel.getAccount(accountAcct == null ? account.getUsername() + "@" + account.getHost() : accountAcct).observe(ShowAccountActivity.this, this::manageViewAccounts);
diff --git a/app/src/main/java/app/fedilab/android/peertube/client/entities/OauthParams.java b/app/src/main/java/app/fedilab/android/peertube/client/entities/OauthParams.java
index f4a572831..a58c2edd4 100644
--- a/app/src/main/java/app/fedilab/android/peertube/client/entities/OauthParams.java
+++ b/app/src/main/java/app/fedilab/android/peertube/client/entities/OauthParams.java
@@ -20,6 +20,8 @@ import com.google.gson.annotations.SerializedName;
 public class OauthParams {
 
 
+    @SerializedName("x_peertube_otp")
+    public String x_peertube_otp;
     @SerializedName("client_id")
     private String client_id;
     @SerializedName("client_secret")
@@ -44,9 +46,6 @@ public class OauthParams {
     private String code;
     @SerializedName("redirect_uri")
     private String redirect_uri;
-    @SerializedName("x_peertube_otp")
-    public String x_peertube_otp;
-
 
     public String getClient_secret() {
         return client_secret;
diff --git a/app/src/main/java/app/fedilab/android/peertube/drawer/InstanceAdapter.java b/app/src/main/java/app/fedilab/android/peertube/drawer/InstanceAdapter.java
index f13e258be..39aa0c988 100644
--- a/app/src/main/java/app/fedilab/android/peertube/drawer/InstanceAdapter.java
+++ b/app/src/main/java/app/fedilab/android/peertube/drawer/InstanceAdapter.java
@@ -45,10 +45,8 @@ import app.fedilab.android.peertube.helper.RoundedBackgroundSpan;
 public class Instanc