From 8505271dd1a46e6a455601b3086b802624518e48 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 29 Nov 2020 17:22:25 +0100 Subject: [PATCH] Clean code --- app/build.gradle | 2 +- .../nitterizeme/activities/InstanceActivity.java | 14 +++++++------- .../nitterizeme/adapters/AppInfoAdapter.java | 2 +- .../nitterizeme/adapters/AppPickerAdapter.java | 2 +- .../nitterizeme/adapters/DefaultAppAdapter.java | 2 +- .../nitterizeme/adapters/InstanceAdapter.java | 4 ++-- .../nitterizeme/helpers/PlayerChromeClient.java | 10 ++++------ .../fedilab/nitterizeme/sqlite/DefaultAppDAO.java | 2 +- .../nitterizeme/viewmodels/SearchInstanceVM.java | 4 ++-- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d86fae2..2d4291d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.preference:preference:1.1.1' implementation 'org.jsoup:jsoup:1.13.1' diff --git a/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java b/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java index 0d7e5b5..7a3d9fd 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java @@ -43,7 +43,7 @@ import app.fedilab.nitterizeme.viewmodels.SearchInstanceVM; public class InstanceActivity extends AppCompatActivity { - private static String list_for_instances = "https://framagit.org/tom79/fedilab_app/-/blob/master/content/untrackme_instances/payload_2.json"; + private static final String list_for_instances = "https://framagit.org/tom79/fedilab_app/-/blob/master/content/untrackme_instances/payload_2.json"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -82,37 +82,37 @@ public class InstanceActivity extends AppCompatActivity { for (Instance instance : result) { if (instance.getType() == Instance.instanceType.INVIDIOUS) { invidiousInstances.add(instance); - if(invidiousHost != null && invidiousHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { + if (invidiousHost != null && invidiousHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { customInvidiousInstance = false; } } else if (instance.getType() == Instance.instanceType.NITTER) { nitterInstances.add(instance); - if(nitterHost != null && nitterHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { + if (nitterHost != null && nitterHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { customNitterInstance = false; } } else if (instance.getType() == Instance.instanceType.BIBLIOGRAM) { bibliogramInstances.add(instance); - if(bibliogramHost != null && bibliogramHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { + if (bibliogramHost != null && bibliogramHost.trim().toLowerCase().compareTo(instance.getDomain()) == 0) { customBibliogramInstance = false; } } } //Check if custom instances are also added - if(customInvidiousInstance) { + if (customInvidiousInstance) { Instance instance = new Instance(); instance.setChecked(true); instance.setDomain(invidiousHost); instance.setLocale("--"); invidiousInstances.add(0, instance); } - if(customNitterInstance) { + if (customNitterInstance) { Instance instance = new Instance(); instance.setChecked(true); instance.setDomain(nitterHost); instance.setLocale("--"); nitterInstances.add(0, instance); } - if(customBibliogramInstance) { + if (customBibliogramInstance) { Instance instance = new Instance(); instance.setChecked(true); instance.setDomain(bibliogramHost); diff --git a/app/src/main/java/app/fedilab/nitterizeme/adapters/AppInfoAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/adapters/AppInfoAdapter.java index d292c88..44fa8d0 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/adapters/AppInfoAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/adapters/AppInfoAdapter.java @@ -40,7 +40,7 @@ public class AppInfoAdapter extends RecyclerView.Adapter appInfos; + private final List appInfos; public AppInfoAdapter(List appInfos) { this.appInfos = appInfos; diff --git a/app/src/main/java/app/fedilab/nitterizeme/adapters/AppPickerAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/adapters/AppPickerAdapter.java index 441f694..b375b3d 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/adapters/AppPickerAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/adapters/AppPickerAdapter.java @@ -32,7 +32,7 @@ import app.fedilab.nitterizeme.entities.AppPicker; public class AppPickerAdapter extends BaseAdapter { - private List appPickers; + private final List appPickers; public AppPickerAdapter(List appPickers) { this.appPickers = appPickers; diff --git a/app/src/main/java/app/fedilab/nitterizeme/adapters/DefaultAppAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/adapters/DefaultAppAdapter.java index fc26b05..918206d 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/adapters/DefaultAppAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/adapters/DefaultAppAdapter.java @@ -39,7 +39,7 @@ import app.fedilab.nitterizeme.sqlite.Sqlite; public class DefaultAppAdapter extends RecyclerView.Adapter { - private List defaultApps; + private final List defaultApps; public DefaultAppAdapter(List packageNames) { this.defaultApps = packageNames; diff --git a/app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java index cb027d9..95d3a52 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java @@ -44,8 +44,8 @@ import static app.fedilab.nitterizeme.activities.MainActivity.SET_NITTER_HOST; public class InstanceAdapter extends RecyclerView.Adapter { - private List instances; - private InstanceAdapter instanceAdapter; + private final List instances; + private final InstanceAdapter instanceAdapter; public InstanceAdapter(List instances) { this.instances = instances; diff --git a/app/src/main/java/app/fedilab/nitterizeme/helpers/PlayerChromeClient.java b/app/src/main/java/app/fedilab/nitterizeme/helpers/PlayerChromeClient.java index 7c31a91..3a816f9 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/helpers/PlayerChromeClient.java +++ b/app/src/main/java/app/fedilab/nitterizeme/helpers/PlayerChromeClient.java @@ -31,16 +31,14 @@ import androidx.appcompat.app.AppCompatActivity; public class PlayerChromeClient extends WebChromeClient implements MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { + private final WebView webView; + private final View activityNonVideoView; + private final ViewGroup activityVideoView; + private final Activity activity; private FrameLayout videoViewContainer; private CustomViewCallback videoViewCallback; - private ToggledFullscreenCallback toggledFullscreenCallback; - - private WebView webView; - private View activityNonVideoView; - private ViewGroup activityVideoView; private boolean isVideoFullscreen; - private Activity activity; public PlayerChromeClient(Activity activity, WebView webView, FrameLayout activityNonVideoView, ViewGroup activityVideoView) { diff --git a/app/src/main/java/app/fedilab/nitterizeme/sqlite/DefaultAppDAO.java b/app/src/main/java/app/fedilab/nitterizeme/sqlite/DefaultAppDAO.java index d25c0c4..4ff92ae 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/sqlite/DefaultAppDAO.java +++ b/app/src/main/java/app/fedilab/nitterizeme/sqlite/DefaultAppDAO.java @@ -25,8 +25,8 @@ import app.fedilab.nitterizeme.helpers.Utils; public class DefaultAppDAO { + private final SQLiteDatabase db; public Context context; - private SQLiteDatabase db; public DefaultAppDAO(Context context, SQLiteDatabase db) { diff --git a/app/src/main/java/app/fedilab/nitterizeme/viewmodels/SearchInstanceVM.java b/app/src/main/java/app/fedilab/nitterizeme/viewmodels/SearchInstanceVM.java index 0fbee70..d2711d1 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/viewmodels/SearchInstanceVM.java +++ b/app/src/main/java/app/fedilab/nitterizeme/viewmodels/SearchInstanceVM.java @@ -77,7 +77,7 @@ public class SearchInstanceVM extends AndroidViewModel { thread.start(); } - private List getInstancesFromFedilabApp(){ + private List getInstancesFromFedilabApp() { HttpsURLConnection httpsURLConnection; ArrayList instances = new ArrayList<>(); try { @@ -145,7 +145,7 @@ public class SearchInstanceVM extends AndroidViewModel { } - private List getInstancesFromBibliogramArt(){ + private List getInstancesFromBibliogramArt() { HttpsURLConnection httpsURLConnection; ArrayList instances = new ArrayList<>(); try {