devol
/
UntrackMe-app-android-redirect-nitter-invidious-bibliogram
mirror of https://framagit.org/tom79/nitterizeme
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean code

This commit is contained in:
Thomas 2020-11-29 17:22:25 +01:00
parent fff72d9958
commit 8505271dd1
9 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -51,7 +51,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.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 'com.google.android.material:material:1.2.1'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
implementation 'org.jsoup:jsoup:1.13.1' implementation 'org.jsoup:jsoup:1.13.1'

14
app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java
View File

@ -43,7 +43,7 @@ import app.fedilab.nitterizeme.viewmodels.SearchInstanceVM;
public class InstanceActivity extends AppCompatActivity { 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 @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -82,37 +82,37 @@ public class InstanceActivity extends AppCompatActivity {
for (Instance instance : result) { for (Instance instance : result) {
if (instance.getType() == Instance.instanceType.INVIDIOUS) { if (instance.getType() == Instance.instanceType.INVIDIOUS) {
invidiousInstances.add(instance); 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; customInvidiousInstance = false;
} }
} else if (instance.getType() == Instance.instanceType.NITTER) { } else if (instance.getType() == Instance.instanceType.NITTER) {
nitterInstances.add(instance); 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; customNitterInstance = false;
} }
} else if (instance.getType() == Instance.instanceType.BIBLIOGRAM) { } else if (instance.getType() == Instance.instanceType.BIBLIOGRAM) {
bibliogramInstances.add(instance); 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; customBibliogramInstance = false;
} }
} }
} }
//Check if custom instances are also added //Check if custom instances are also added
if(customInvidiousInstance) { if (customInvidiousInstance) {
Instance instance = new Instance(); Instance instance = new Instance();
instance.setChecked(true); instance.setChecked(true);
instance.setDomain(invidiousHost); instance.setDomain(invidiousHost);
instance.setLocale("--"); instance.setLocale("--");
invidiousInstances.add(0, instance); invidiousInstances.add(0, instance);
} }
if(customNitterInstance) { if (customNitterInstance) {
Instance instance = new Instance(); Instance instance = new Instance();
instance.setChecked(true); instance.setChecked(true);
instance.setDomain(nitterHost); instance.setDomain(nitterHost);
instance.setLocale("--"); instance.setLocale("--");
nitterInstances.add(0, instance); nitterInstances.add(0, instance);
} }
if(customBibliogramInstance) { if (customBibliogramInstance) {
Instance instance = new Instance(); Instance instance = new Instance();
instance.setChecked(true); instance.setChecked(true);
instance.setDomain(bibliogramHost); instance.setDomain(bibliogramHost);

2
app/src/main/java/app/fedilab/nitterizeme/adapters/AppInfoAdapter.java
View File

@ -40,7 +40,7 @@ public class AppInfoAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
private static final int LAYOUT_TITLE = 0; private static final int LAYOUT_TITLE = 0;
private static final int LAYOUT_INFO = 1; private static final int LAYOUT_INFO = 1;
private List<AppInfo> appInfos; private final List<AppInfo> appInfos;
public AppInfoAdapter(List<AppInfo> appInfos) { public AppInfoAdapter(List<AppInfo> appInfos) {
this.appInfos = appInfos; this.appInfos = appInfos;

2
app/src/main/java/app/fedilab/nitterizeme/adapters/AppPickerAdapter.java
View File

@ -32,7 +32,7 @@ import app.fedilab.nitterizeme.entities.AppPicker;
public class AppPickerAdapter extends BaseAdapter { public class AppPickerAdapter extends BaseAdapter {
private List<AppPicker> appPickers; private final List<AppPicker> appPickers;
public AppPickerAdapter(List<AppPicker> appPickers) { public AppPickerAdapter(List<AppPicker> appPickers) {
this.appPickers = appPickers; this.appPickers = appPickers;

2
app/src/main/java/app/fedilab/nitterizeme/adapters/DefaultAppAdapter.java
View File

@ -39,7 +39,7 @@ import app.fedilab.nitterizeme.sqlite.Sqlite;
public class DefaultAppAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { public class DefaultAppAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private List<DefaultApp> defaultApps; private final List<DefaultApp> defaultApps;
public DefaultAppAdapter(List<DefaultApp> packageNames) { public DefaultAppAdapter(List<DefaultApp> packageNames) {
this.defaultApps = packageNames; this.defaultApps = packageNames;

4
app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java
View File

@ -44,8 +44,8 @@ import static app.fedilab.nitterizeme.activities.MainActivity.SET_NITTER_HOST;
public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private List<Instance> instances; private final List<Instance> instances;
private InstanceAdapter instanceAdapter; private final InstanceAdapter instanceAdapter;
public InstanceAdapter(List<Instance> instances) { public InstanceAdapter(List<Instance> instances) {
this.instances = instances; this.instances = instances;

10
app/src/main/java/app/fedilab/nitterizeme/helpers/PlayerChromeClient.java
View File

@ -31,16 +31,14 @@ import androidx.appcompat.app.AppCompatActivity;
public class PlayerChromeClient extends WebChromeClient implements MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { 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 FrameLayout videoViewContainer;
private CustomViewCallback videoViewCallback; private CustomViewCallback videoViewCallback;
private ToggledFullscreenCallback toggledFullscreenCallback; private ToggledFullscreenCallback toggledFullscreenCallback;
private WebView webView;
private View activityNonVideoView;
private ViewGroup activityVideoView;
private boolean isVideoFullscreen; private boolean isVideoFullscreen;
private Activity activity;
public PlayerChromeClient(Activity activity, WebView webView, FrameLayout activityNonVideoView, ViewGroup activityVideoView) { public PlayerChromeClient(Activity activity, WebView webView, FrameLayout activityNonVideoView, ViewGroup activityVideoView) {

2
app/src/main/java/app/fedilab/nitterizeme/sqlite/DefaultAppDAO.java
View File

@ -25,8 +25,8 @@ import app.fedilab.nitterizeme.helpers.Utils;
public class DefaultAppDAO { public class DefaultAppDAO {
private final SQLiteDatabase db;
public Context context; public Context context;
private SQLiteDatabase db;
public DefaultAppDAO(Context context, SQLiteDatabase db) { public DefaultAppDAO(Context context, SQLiteDatabase db) {

4
app/src/main/java/app/fedilab/nitterizeme/viewmodels/SearchInstanceVM.java
View File

@ -77,7 +77,7 @@ public class SearchInstanceVM extends AndroidViewModel {
thread.start(); thread.start();
} }
private List<Instance> getInstancesFromFedilabApp(){ private List<Instance> getInstancesFromFedilabApp() {
HttpsURLConnection httpsURLConnection; HttpsURLConnection httpsURLConnection;
ArrayList<Instance> instances = new ArrayList<>(); ArrayList<Instance> instances = new ArrayList<>();
try { try {
@ -145,7 +145,7 @@ public class SearchInstanceVM extends AndroidViewModel {
} }
private List<Instance> getInstancesFromBibliogramArt(){ private List<Instance> getInstancesFromBibliogramArt() {
HttpsURLConnection httpsURLConnection; HttpsURLConnection httpsURLConnection;
ArrayList<Instance> instances = new ArrayList<>(); ArrayList<Instance> instances = new ArrayList<>();
try { try {