diff --git a/app/build.gradle b/app/build.gradle
index f117c008d..ca39347f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -126,11 +126,11 @@ dependencies {
     implementation "com.google.guava:guava:28.2-android"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
     implementation 'com.r0adkll:slidableactivity:2.1.0'
-    implementation 'com.github.stom79:mytransl:2.0'
+    implementation 'com.github.stom79:mytransl:3.0'
     implementation 'com.github.stom79:SparkButton:1.0.13'
-    implementation "com.koushikdutta.async:androidasync:2.+"
+    implementation "com.koushikdutta.async:androidasync:3.+"
     implementation 'com.oguzdev:CircularFloatingActionMenu:1.0.2'
-    implementation 'com.github.franmontiel:LocaleChanger:0.9.2' implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.github.franmontiel:LocaleChanger:0.9.2'
     implementation 'com.github.GrenderG:Toasty:1.4.2'
     implementation 'com.elconfidencial.bubbleshowcase:bubbleshowcase:1.3.1'
     implementation 'androidx.multidex:multidex:2.0.1'
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 05ceb6477..e63ad7111 100644
--- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
@@ -20,7 +20,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.style.UnderlineSpan;
@@ -64,9 +63,9 @@ import es.dmoral.toasty.Toasty;
 
 public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccountInterface, OnRetrieveRelationshipInterface {
 
-    private List<Account> developers = new ArrayList<>();
-    private List<Account> contributors = new ArrayList<>();
-    private List<Account> uxuidesigners = new ArrayList<>();
+    private final List<Account> developers = new ArrayList<>();
+    private final List<Account> contributors = new ArrayList<>();
+    private final List<Account> uxuidesigners = new ArrayList<>();
 
     private AccountSearchDevAdapter accountSearchWebAdapterDeveloper;
     private AccountSearchDevAdapter accountSearchWebAdapterContributors;
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 ae451a643..8e5b9c09d 100644
--- a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
@@ -19,7 +19,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 017c66b27..19f2d7a87 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -184,8 +184,8 @@ public abstract class BaseMainActivity extends BaseActivity
     private static boolean notificationChecked = false;
     private final int PICK_IMPORT = 5556;
     private FloatingActionButton toot, delete_all, add_new;
-    private HashMap<String, String> tagTile = new HashMap<>();
-    private HashMap<String, Integer> tagItem = new HashMap<>();
+    private final HashMap<String, String> tagTile = new HashMap<>();
+    private final HashMap<String, Integer> tagItem = new HashMap<>();
     private TextView toolbarTitle;
     private SearchView toolbar_search;
     private View headerLayout;
@@ -1111,11 +1111,7 @@ public abstract class BaseMainActivity extends BaseActivity
         Helper.updateHeaderAccountInfo(activity, account, headerLayout);
         //Locked account can see follow request
         if (MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
-            if (account.isLocked()) {
-                navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
-            } else {
-                navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
-            }
+            navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(account.isLocked());
         }
 
         if (!BuildConfig.DONATIONS) {
@@ -2358,12 +2354,13 @@ public abstract class BaseMainActivity extends BaseActivity
         }
         try {
             TabLayoutNotificationsFragment tabLayoutNotificationsFragment = (TabLayoutNotificationsFragment) mPageReferenceMap.get(position);
-            assert tabLayoutNotificationsFragment != null;
-            ViewPager notifViewPager = Objects.requireNonNull(tabLayoutNotificationsFragment).getViewPager();
 
-            if (notifViewPager != null && notifViewPager.getAdapter() != null) {
-                DisplayNotificationsFragment displayNotificationsFragment = (DisplayNotificationsFragment) notifViewPager.getAdapter().instantiateItem(notifViewPager, 0);
-                displayNotificationsFragment.updateNotificationRead();
+            if (tabLayoutNotificationsFragment != null) {
+                ViewPager notifViewPager = tabLayoutNotificationsFragment.getViewPager();
+                if (notifViewPager != null && notifViewPager.getAdapter() != null) {
+                    DisplayNotificationsFragment displayNotificationsFragment = (DisplayNotificationsFragment) notifViewPager.getAdapter().instantiateItem(notifViewPager, 0);
+                    displayNotificationsFragment.updateNotificationRead();
+                }
             }
         } catch (Exception ignored) {
         }
diff --git a/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
index 4fd577adf..024a1c227 100644
--- a/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BasePixelfedComposeActivity.java
@@ -181,7 +181,7 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
     public static boolean autocomplete;
     public static Uri photoFileUri = null;
     static boolean active = false;
-    private static int searchDeep = 15;
+    private static final int searchDeep = 15;
     private final int PICK_IMAGE = 56556;
     private final int TAKE_PHOTO = 56532;
     public long currentToId;
@@ -217,7 +217,7 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
     private SliderView imageSlider;
     private SliderAdapter sliderAdapter;
     private CheckBox pixelfed_story;
-    private BroadcastReceiver imageReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String imgpath = intent.getStringExtra("imgpath");
@@ -226,7 +226,7 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
             }
         }
     };
-    private BroadcastReceiver add_new_media = new BroadcastReceiver() {
+    private final BroadcastReceiver add_new_media = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             pixelfed_story.setEnabled(true);
@@ -636,11 +636,7 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
                         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BasePixelfedComposeActivity.this, style);
                         dialogBuilder.setMessage(R.string.save_draft);
                         dialogBuilder.setPositiveButton(R.string.save, (dialog, id) -> {
-                            if (accountReply == null) {
-                                storeToot(true, false);
-                            } else {
-                                storeToot(false, false);
-                            }
+                            storeToot(accountReply == null, false);
                             dialog.dismiss();
                             finish();
                         });
@@ -1457,11 +1453,7 @@ public abstract class BasePixelfedComposeActivity extends BaseActivity implement
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BasePixelfedComposeActivity.this, style);
                 dialogBuilder.setMessage(R.string.save_draft);
                 dialogBuilder.setPositiveButton(R.string.save, (dialog, id) -> {
-                    if (accountReply == null) {
-                        storeToot(true, false);
-                    } else {
-                        storeToot(false, false);
-                    }
+                    storeToot(accountReply == null, false);
                     dialog.dismiss();
                     finish();
                 });
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
index 98f87535e..32a1cb8bb 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseTootActivity.java
@@ -224,7 +224,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
     public static Uri photoFileUri = null;
     static boolean active = false;
     private static String instance;
-    private static int searchDeep = 15;
+    private static final int searchDeep = 15;
     private final int PICK_IMAGE = 56556;
     private final int TAKE_PHOTO = 56532;
     public long currentToId;
@@ -284,7 +284,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
     private EditText wysiwygEditText;
     private String url_for_media;
     private UpdateAccountInfoAsyncTask.SOCIAL social;
-    private BroadcastReceiver imageReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String imgpath = intent.getStringExtra("imgpath");
@@ -293,7 +293,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
             }
         }
     };
-    private BroadcastReceiver add_new_media = new BroadcastReceiver() {
+    private final BroadcastReceiver add_new_media = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
 
@@ -803,11 +803,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
                         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BaseTootActivity.this, style);
                         dialogBuilder.setMessage(R.string.save_draft);
                         dialogBuilder.setPositiveButton(R.string.save, (dialog, id) -> {
-                            if (accountReply == null) {
-                                storeToot(true, false);
-                            } else {
-                                storeToot(false, false);
-                            }
+                            storeToot(accountReply == null, false);
                             dialog.dismiss();
                             finish();
                         });
@@ -2185,11 +2181,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         final List<Emojis> emojis = new CustomEmojiDAO(BaseTootActivity.this, db).getAllEmojis();
         //Displays button only if custom emojis
-        if (emojis != null && emojis.size() > 0) {
-            itemEmoji.setVisible(true);
-        } else {
-            itemEmoji.setVisible(false);
-        }
+        itemEmoji.setVisible(emojis != null && emojis.size() > 0);
         if (accountReply != null) {
             MenuItem itemRestore = menu.findItem(R.id.action_restore);
             if (itemRestore != null)
@@ -2403,11 +2395,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BaseTootActivity.this, style);
                 dialogBuilder.setMessage(R.string.save_draft);
                 dialogBuilder.setPositiveButton(R.string.save, (dialog, id) -> {
-                    if (accountReply == null) {
-                        storeToot(true, false);
-                    } else {
-                        storeToot(false, false);
-                    }
+                    storeToot(accountReply == null, false);
                     dialog.dismiss();
                     finish();
                 });
@@ -3748,7 +3736,7 @@ public abstract class BaseTootActivity extends BaseActivity implements UploadSta
         UploadServiceSingleBroadcastReceiver uploadReceiver;
         String filename;
         UpdateAccountInfoAsyncTask.SOCIAL social;
-        private Account account;
+        private final Account account;
 
         asyncPicture(Activity activity, Account account, UpdateAccountInfoAsyncTask.SOCIAL social, android.net.Uri uri, String filename, UploadServiceSingleBroadcastReceiver uploadReceiver) {
             this.activityWeakReference = new WeakReference<>(activity);
diff --git a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
index d97d45e86..b64163972 100644
--- a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
@@ -18,7 +18,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
index e9094d98a..b37a8e6ec 100644
--- a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
@@ -19,7 +19,6 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
index 00672147b..197de8bd8 100644
--- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
@@ -27,7 +27,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -213,14 +212,8 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
         set_profile_description.setEnabled(true);
         set_lock_account.setEnabled(true);
         set_sensitive_content.setEnabled(true);
-        if (account.isLocked())
-            set_lock_account.setChecked(true);
-        else
-            set_lock_account.setChecked(false);
-        if (account.isSensitive())
-            set_sensitive_content.setChecked(true);
-        else
-            set_sensitive_content.setChecked(false);
+        set_lock_account.setChecked(account.isLocked());
+        set_sensitive_content.setChecked(account.isSensitive());
         set_profile_description.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/java/app/fedilab/android/activities/GroupActivity.java b/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
index 756efa646..42e4cd21b 100644
--- a/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
@@ -16,7 +16,6 @@ package app.fedilab.android.activities;
 
 
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
index 6bf4290aa..4efcfe54b 100644
--- a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
@@ -18,7 +18,6 @@ package app.fedilab.android.activities;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -199,22 +198,21 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.action_pin:
-                SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                new SearchDAO(HashTagActivity.this, db).insertSearch(tag);
-                Intent intent = new Intent(HashTagActivity.this, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.putExtra(Helper.INTENT_ACTION, Helper.SEARCH_TAG);
-                intent.putExtra(Helper.SEARCH_KEYWORD, tag);
-                startActivity(intent);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            finish();
+            return true;
+        } else if (itemId == R.id.action_pin) {
+            SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+            new SearchDAO(HashTagActivity.this, db).insertSearch(tag);
+            Intent intent = new Intent(HashTagActivity.this, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(Helper.INTENT_ACTION, Helper.SEARCH_TAG);
+            intent.putExtra(Helper.SEARCH_KEYWORD, tag);
+            startActivity(intent);
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
index e78900a86..4035dcd33 100644
--- a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
diff --git a/app/src/main/java/app/fedilab/android/activities/ListActivity.java b/app/src/main/java/app/fedilab/android/activities/ListActivity.java
index 93cfdd53e..e03332bf5 100644
--- a/app/src/main/java/app/fedilab/android/activities/ListActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ListActivity.java
@@ -17,7 +17,6 @@ package app.fedilab.android.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.InputFilter;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
index 54ab671b5..71cb114ff 100644
--- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
@@ -23,7 +23,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.SpannableString;
diff --git a/app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java b/app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java
index ab8dc457f..1ee98653d 100644
--- a/app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java
@@ -15,7 +15,6 @@
 package app.fedilab.android.activities;
 
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
index 413dd6452..6fd528aa8 100644
--- a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
@@ -339,8 +339,8 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
 
     private static class checkRegistration extends AsyncTask<Void, Void, String> {
 
-        private String instance;
-        private WeakReference<Context> weakReference;
+        private final String instance;
+        private final WeakReference<Context> weakReference;
 
         checkRegistration(Context context, String instance) {
             this.instance = instance;
diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
index 5241ce51c..b451dcebf 100644
--- a/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
@@ -272,8 +272,8 @@ public class MastodonShareRegisterActivity extends BaseActivity implements OnRet
 
     private static class checkRegistration extends AsyncTask<Void, Void, String> {
 
-        private String instance;
-        private WeakReference<Context> weakReference;
+        private final String instance;
+        private final WeakReference<Context> weakReference;
 
         checkRegistration(Context context, String instance) {
             this.instance = instance;
diff --git a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
index b05d30132..985a55246 100644
--- a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
@@ -18,7 +18,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ -58,7 +57,7 @@ import es.dmoral.toasty.Toasty;
 
 public class PartnerShipActivity extends BaseActivity implements OnRetrieveRemoteAccountInterface, OnRetrieveRelationshipInterface {
 
-    private List<Account> mastohostAcct = new ArrayList<>();
+    private final List<Account> mastohostAcct = new ArrayList<>();
 
     private AccountSearchDevAdapter mastohostAdapter;
 
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
index 078e384af..53707c7c4 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
@@ -854,8 +854,8 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
 
     private static class commentTask extends AsyncTask<Void, Void, app.fedilab.android.client.Entities.Status> {
 
-        private WeakReference<Context> contextReference;
-        private Peertube peertube;
+        private final WeakReference<Context> contextReference;
+        private final Peertube peertube;
 
         commentTask(WeakReference<Context> contextReference, Peertube peertube) {
             this.peertube = peertube;
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
index 8ca501935..d646f17cd 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
@@ -18,7 +18,6 @@ package app.fedilab.android.activities;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
index 2852ebb14..58f33215e 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
@@ -26,7 +26,6 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.OpenableColumns;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
index 572579fdb..c2cae0ee3 100644
--- a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
@@ -17,7 +17,6 @@ package app.fedilab.android.activities;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
diff --git a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
index 13b4eb688..58ac7b2d7 100644
--- a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
@@ -20,7 +20,6 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
@@ -238,14 +237,9 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                         if (radioGroup.getCheckedRadioButtonId() != R.id.twitter_accounts) {
                             Pattern host = Pattern.compile("([\\da-z.-]+\\.[a-z.]{2,12})");
                             Matcher matcher = host.matcher(s.toString().trim());
-                            if (s.toString().trim().length() == 0 || !matcher.find()) {
-                                alertDialog.getButton(
-                                        AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                            } else {
-                                // Something into edit text. Enable the button.
-                                alertDialog.getButton(
-                                        AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-                            }
+                            // Something into edit text. Enable the button.
+                            alertDialog.getButton(
+                                    AlertDialog.BUTTON_POSITIVE).setEnabled(s.toString().trim().length() != 0 && matcher.find());
                             if (s.length() > 2 && !isLoadingInstance) {
                                 final String action = "/instances/search";
                                 final HashMap<String, String> parameters = new HashMap<>();
diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
index af030b958..8b829f165 100644
--- a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
@@ -16,7 +16,6 @@ package app.fedilab.android.activities;
 
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
index 31ed0d1d3..499565d8e 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
@@ -21,7 +21,6 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
@@ -169,11 +168,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
             if (statuses != null && statuses.size() > 0) {
                 spoilerShown = !spoilerShown;
                 for (Status status : statuses) {
-                    if (spoilerBehaviour && !status.isSpoilerShown()) {
-                        status.setAutoHiddenCW(true);
-                    } else {
-                        status.setAutoHiddenCW(false);
-                    }
+                    status.setAutoHiddenCW(spoilerBehaviour && !status.isSpoilerShown());
                     status.setSpoilerShown(spoilerShown);
                     status.setShowSpoiler(spoilerShown);
                 }
diff --git a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
index 86381e200..b83b11bed 100644
--- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
@@ -84,7 +84,7 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
     private float startY;
     private int bgColor;
 
-    private BroadcastReceiver onDownloadComplete = new BroadcastReceiver() {
+    private final BroadcastReceiver onDownloadComplete = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
@@ -279,26 +279,23 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    int position = mPager.getCurrentItem();
-                    Attachment attachment = attachments.get(position);
-                    if (attachment.getType().compareTo("image") == 0) {
-                        Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), false);
-                    } else {
-                        Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
-                        downloadID = -1;
-                    }
-                } else { /*Todo: Toast "Storage Permission Required" */ }
-                return;
-            case Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SHARE:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    int position = mPager.getCurrentItem();
-                    Attachment attachment = attachments.get(position);
-                    downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
-                } else { /*Todo: Toast "Storage Permission Required" */ }
-                break;
+        if (requestCode == Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                int position = mPager.getCurrentItem();
+                Attachment attachment = attachments.get(position);
+                if (attachment.getType().compareTo("image") == 0) {
+                    Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), false);
+                } else {
+                    Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
+                    downloadID = -1;
+                }
+            } else { /*Todo: Toast "Storage Permission Required" */ }
+        } else if (requestCode == Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SHARE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                int position = mPager.getCurrentItem();
+                Attachment attachment = attachments.get(position);
+                downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
+            } else { /*Todo: Toast "Storage Permission Required" */ }
         }
     }
 
diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
index acc8ef9cc..5dafcd621 100644
--- a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
@@ -21,7 +21,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -67,6 +66,7 @@ public class WebviewConnectActivity extends BaseActivity {
     private String instance;
     private UpdateAccountInfoAsyncTask.SOCIAL social;
 
+    @SuppressWarnings("deprecation")
     public static void clearCookies(Context context) {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
diff --git a/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java b/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
index 965a0760b..0480bcb9e 100644
--- a/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
@@ -16,7 +16,6 @@ package app.fedilab.android.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.MenuItem;
diff --git a/app/src/main/java/app/fedilab/android/webview/MastalabWebChromeClient.java b/app/src/main/java/app/fedilab/android/webview/MastalabWebChromeClient.java
index dd30053ff..4876b3bdc 100644
--- a/app/src/main/java/app/fedilab/android/webview/MastalabWebChromeClient.java
+++ b/app/src/main/java/app/fedilab/android/webview/MastalabWebChromeClient.java
@@ -46,12 +46,12 @@ public class MastalabWebChromeClient extends WebChromeClient implements MediaPla
 
     private ToggledFullscreenCallback toggledFullscreenCallback;
 
-    private CustomWebview webView;
-    private View activityNonVideoView;
-    private ViewGroup activityVideoView;
-    private ProgressBar pbar;
+    private final CustomWebview webView;
+    private final View activityNonVideoView;
+    private final ViewGroup activityVideoView;
+    private final ProgressBar pbar;
     private boolean isVideoFullscreen;
-    private Activity activity;
+    private final Activity activity;
 
 
     public MastalabWebChromeClient(Activity activity, CustomWebview webView, FrameLayout activityNonVideoView, ViewGroup activityVideoView) {
diff --git a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
index 66f996791..e00c0ae0b 100644
--- a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
+++ b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
@@ -49,7 +49,7 @@ import app.fedilab.android.helper.Helper;
 public class MastalabWebViewClient extends WebViewClient {
 
     public List<String> domains = new ArrayList<>();
-    private Activity activity;
+    private final Activity activity;
     private int count = 0;
 
     public MastalabWebViewClient(Activity activity) {