Some cleaning

58 files changed, 215 insertions, 282 deletions

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 8c321234c..ec60e99a4 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -36,7 +36,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.database.MatrixCursor;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
@@ -73,7 +72,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.GravityCompat;
 import androidx.cursoradapter.widget.CursorAdapter;
@@ -81,7 +79,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
-
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
@@ -1625,8 +1622,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
             if (binding.viewPager.getAdapter() != null) {
                 int tabPosition = binding.tabLayout.getSelectedTabPosition();
                 Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(tabPosition, 0));
-                if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
-                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
+                if (fragment instanceof FragmentMastodonTimeline fragmentMastodonTimeline && fragment.isVisible()) {
                     fragmentMastodonTimeline.refreshAllAdapters();
                 }
             }
@@ -1921,14 +1917,11 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         int position = binding.tabLayout.getSelectedTabPosition();
         if (binding.viewPager.getAdapter() != null) {
             Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(position, 0));
-            if (fragment instanceof FragmentMastodonTimeline) {
-                FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
+            if (fragment instanceof FragmentMastodonTimeline fragmentMastodonTimeline) {
                 fragmentMastodonTimeline.scrollToTop();
-            } else if (fragment instanceof FragmentMastodonConversation) {
-                FragmentMastodonConversation fragmentMastodonConversation = ((FragmentMastodonConversation) fragment);
+            } else if (fragment instanceof FragmentMastodonConversation fragmentMastodonConversation) {
                 fragmentMastodonConversation.scrollToTop();
-            } else if (fragment instanceof FragmentNotificationContainer) {
-                FragmentNotificationContainer fragmentNotificationContainer = ((FragmentNotificationContainer) fragment);
+            } else if (fragment instanceof FragmentNotificationContainer fragmentNotificationContainer) {
                 fragmentNotificationContainer.scrollToTop();
             }
         }
diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
index fe57ba51e..7e7841f56 100644
--- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
@@ -28,7 +28,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.core.app.ActivityOptionsCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.ArrayList;
@@ -87,10 +86,10 @@ public class AboutActivity extends BaseBarActivity {
 
 
         String finalVersion = version;
-        binding.aboutVersionCopy.setOnClickListener(v->{
+        binding.aboutVersionCopy.setOnClickListener(v -> {
 
             ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-            String content = "Fedilab v" + finalVersion + " for " + (BuildConfig.DONATIONS?"FDroid":"Google");
+            String content = "Fedilab v" + finalVersion + " for " + (BuildConfig.DONATIONS ? "FDroid" : "Google");
 
             ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, content);
             if (clipboard != null) {
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java
index 72bd611bd..84c454baf 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java
@@ -52,6 +52,7 @@ public class AccountReportActivity extends BaseBarActivity {
     private ActivityAdminReportBinding binding;
     private AdminVM adminVM;
     private AdminAccount targeted_account;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -73,9 +74,10 @@ public class AccountReportActivity extends BaseBarActivity {
             initializeAfterBundle(null);
         }
     }
+
     private void initializeAfterBundle(Bundle bundle) {
 
-        if(bundle != null) {
+        if (bundle != null) {
             account_id = bundle.getString(Helper.ARG_ACCOUNT_ID, null);
             targeted_account = (AdminAccount) bundle.getSerializable(Helper.ARG_ACCOUNT);
             report = (AdminReport) bundle.getSerializable(Helper.ARG_REPORT);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
index 6ab76c086..b0c2041d4 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
@@ -39,7 +39,6 @@ import org.conscrypt.Conscrypt;
 
 import java.security.Security;
 
-import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.ThemeHelper;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
index 5c52063d3..3b0893428 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
@@ -50,7 +50,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
-
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.work.Data;
@@ -485,9 +484,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);
         statusList = new ArrayList<>();
         Bundle b = getIntent().getExtras();
-        if(b != null) {
+        if (b != null) {
             long bundleId = b.getLong(Helper.ARG_INTENT_ID, -1);
-            if(bundleId != -1 ) {
+            if (bundleId != -1) {
                 new CachedBundle(ComposeActivity.this).getBundle(bundleId, currentAccount, this::initializeAfterBundle);
             } else {
                 initializeAfterBundle(b);
@@ -497,7 +496,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
 
     private void initializeAfterBundle(Bundle b) {
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        new Thread(()->{
+        new Thread(() -> {
             if (b != null) {
                 statusReply = (Status) b.getSerializable(Helper.ARG_STATUS_REPLY);
                 statusQuoted = (Status) b.getSerializable(Helper.ARG_QUOTED_MESSAGE);
@@ -802,7 +801,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         status.id = Helper.generateIdString();
         status.mentions = statusList.get(position - 1).mentions;
         status.visibility = statusList.get(position - 1).visibility;
-        if(initialContent != null) {
+        if (initialContent != null) {
             status.text = initialContent;
         }
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ComposeActivity.this);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
index 77fa5ce5f..8d5a49f53 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
@@ -33,7 +33,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
 
-
 import com.bumptech.glide.Glide;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java
index 9b75fe471..badd58986 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java
@@ -40,7 +40,6 @@ import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityFollowedTagsBinding;
 import app.fedilab.android.databinding.PopupAddFollowedTagtBinding;
-import app.fedilab.android.mastodon.client.entities.api.MastodonList;
 import app.fedilab.android.mastodon.client.entities.api.Tag;
 import app.fedilab.android.mastodon.client.entities.app.Timeline;
 import app.fedilab.android.mastodon.helper.Helper;
@@ -151,7 +150,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
             popupAddFollowedTagtBinding.addTag.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
             dialogBuilder.setPositiveButton(R.string.validate, (dialog, id) -> {
                 String name = Objects.requireNonNull(popupAddFollowedTagtBinding.addTag.getText()).toString().trim();
-                if(tagList.contains(new Tag(name))) {
+                if (tagList.contains(new Tag(name))) {
                     Toasty.error(FollowedTagActivity.this, getString(R.string.tag_already_followed), Toasty.LENGTH_LONG).show();
                     return;
                 }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java
index 83ac74a5a..94d8b0e92 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java
@@ -29,7 +29,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
 
-
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
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 a0290ba90..1a0bd5c5d 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
@@ -60,63 +60,63 @@ class InstanceHealthActivity : DialogFragment() {
 
     private fun checkInstance() {
         val instanceSocialVM =
-            ViewModelProvider(this@InstanceHealthActivity)[InstanceSocialVM::class.java]
+                ViewModelProvider(this@InstanceHealthActivity)[InstanceSocialVM::class.java]
         instanceSocialVM.getInstances(BaseMainActivity.currentInstance.trim { it <= ' ' })
-            .observe(this@InstanceHealthActivity) { instanceSocialList: InstanceSocial? ->
-                val instance = instanceSocialList?.instances?.firstOrNull { instance ->
-                    instance.name.equals(
-                        BaseMainActivity.currentInstance.trim { it <= ' ' },
-                        ignoreCase = true
-                    )
-                }
-                if (instance != null) {
-                    instance.thumbnail?.takeIf { it != "null" }?.let { thumbnail ->
-                        Glide.with(this@InstanceHealthActivity)
-                            .asBitmap()
-                            .placeholder(R.drawable.default_banner)
-                            .load(thumbnail)
-                            .into(binding.backgroundImage)
+                .observe(this@InstanceHealthActivity) { instanceSocialList: InstanceSocial? ->
+                    val instance = instanceSocialList?.instances?.firstOrNull { instance ->
+                        instance.name.equals(
+                                BaseMainActivity.currentInstance.trim { it <= ' ' },
+                                ignoreCase = true
+                        )
                     }
-                    binding.name.text = instance.name
-                    if (instance.up) {
-                        binding.up.setText(R.string.is_up)
-                        binding.up.setTextColor(
-                            ThemeHelper.getAttColor(
-                                requireContext(),
-                                R.attr.colorPrimary
+                    if (instance != null) {
+                        instance.thumbnail?.takeIf { it != "null" }?.let { thumbnail ->
+                            Glide.with(this@InstanceHealthActivity)
+                                    .asBitmap()
+                                    .placeholder(R.drawable.default_banner)
+                                    .load(thumbnail)
+                                    .into(binding.backgroundImage)
+                        }
+                        binding.name.text = instance.name
+                        if (instance.up) {
+                            binding.up.setText(R.string.is_up)
+                            binding.up.setTextColor(
+                                    ThemeHelper.getAttColor(
+                                            requireContext(),
+                                            R.attr.colorPrimary
+                                    )
                             )
-                        )
-                    } else {
-                        binding.up.setText(R.string.is_down)
-                        binding.up.setTextColor(
-                            ThemeHelper.getAttColor(
-                                requireContext(),
-                                R.attr.colorError
+                        } else {
+                            binding.up.setText(R.string.is_down)
+                            binding.up.setTextColor(
+                                    ThemeHelper.getAttColor(
+                                            requireContext(),
+                                            R.attr.colorError
+                                    )
                             )
+                        }
+                        binding.uptime.text = getString(
+                                R.string.instance_health_uptime,
+                                instance.uptime * 100
                         )
+                        if (instance.checked_at != null)
+                            binding.checkedAt.text =
+                                    getString(
+                                            R.string.instance_health_checkedat,
+                                            Helper.dateToString(instance.checked_at)
+                                    )
+                        binding.values.text = getString(
+                                R.string.instance_health_indication,
+                                instance.version,
+                                Helper.withSuffix(instance.active_users.toLong()),
+                                Helper.withSuffix(instance.statuses.toLong())
+                        )
+                    } else {
+                        binding.instanceData.isVisible = false
+                        binding.noInstance.isVisible = true
                     }
-                    binding.uptime.text = getString(
-                        R.string.instance_health_uptime,
-                        instance.uptime * 100
-                    )
-                    if (instance.checked_at != null)
-                        binding.checkedAt.text =
-                            getString(
-                                R.string.instance_health_checkedat,
-                                Helper.dateToString(instance.checked_at)
-                            )
-                    binding.values.text = getString(
-                        R.string.instance_health_indication,
-                        instance.version,
-                        Helper.withSuffix(instance.active_users.toLong()),
-                        Helper.withSuffix(instance.statuses.toLong())