From bff106561b2190a8f285727f7e815bf96f900e39 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sun, 17 Dec 2017 14:20:04 +0100 Subject: [PATCH] Some cleaning --- .../fragments/DisplayFollowRequestSentFragment.java | 3 ++- .../mastodon/fragments/DisplayListsFragment.java | 9 ++------- .../fragments/DisplayScheduledTootsFragment.java | 3 ++- .../fragments/SettingsOptimizationFragment.java | 4 +++- .../mastodon/helper/ExpandableHeightListView.java | 2 +- .../fr/gouv/etalab/mastodon/jobs/ApplicationJob.java | 4 +++- .../gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java | 4 ---- .../etalab/mastodon/jobs/NotificationsSyncJob.java | 4 ---- .../etalab/mastodon/jobs/ScheduledTootsSyncJob.java | 2 +- .../fr/gouv/etalab/mastodon/services/BaseService.java | 10 +++++----- .../mastodon/services/LiveNotificationService.java | 2 +- 11 files changed, 20 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java index 34e31096d..a51d957cb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java @@ -18,6 +18,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DividerItemDecoration; @@ -62,7 +63,7 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr private boolean swiped; private RecyclerView lv_accounts; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { //View for fragment is the same that fragment accounts View rootView = inflater.inflate(R.layout.fragment_accounts, container, false); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java index d9450dbe0..871a36ca1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java @@ -48,9 +48,6 @@ import fr.gouv.etalab.mastodon.client.APIResponse; import fr.gouv.etalab.mastodon.drawers.ListAdapter; import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.interfaces.OnListActionInterface; -import fr.gouv.etalab.mastodon.sqlite.SearchDAO; - -import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; /** @@ -65,8 +62,6 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf private List lists; private TextView no_action_text; private RelativeLayout mainLoader; - private ListView lv_lists; - private RelativeLayout textviewNoAction; private FloatingActionButton add_new; private ListAdapter listAdapter; @@ -80,8 +75,8 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf lists = new ArrayList<>(); - lv_lists = rootView.findViewById(R.id.lv_lists); - textviewNoAction = rootView.findViewById(R.id.no_action); + ListView lv_lists = rootView.findViewById(R.id.lv_lists); + RelativeLayout textviewNoAction = rootView.findViewById(R.id.no_action); no_action_text = rootView.findViewById(R.id.no_action_text); mainLoader = rootView.findViewById(R.id.loader); RelativeLayout nextElementLoader = rootView.findViewById(R.id.loading_next_items); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java index 9a3911035..47adeeda2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayScheduledTootsFragment.java @@ -26,6 +26,7 @@ import android.os.Build; import android.os.Bundle; import android.os.PowerManager; import android.provider.Settings; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -60,7 +61,7 @@ public class DisplayScheduledTootsFragment extends Fragment implements OnRetriev private TextView warning_battery_message; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_scheduled_toots, container, false); context = getContext(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java index 957617b1f..804206adc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsOptimizationFragment.java @@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.fragments; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -38,10 +39,11 @@ public class SettingsOptimizationFragment extends Fragment { private Context context; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_settings_optimization, container, false); context = getContext(); + assert context != null; final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/ExpandableHeightListView.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/ExpandableHeightListView.java index bf207a0f8..96dd3b13c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/ExpandableHeightListView.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/ExpandableHeightListView.java @@ -57,7 +57,7 @@ public class ExpandableHeightListView extends ListView } } - public void setExpanded(boolean expanded) + public void setExpanded(@SuppressWarnings("SameParameterValue") boolean expanded) { this.expanded = expanded; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java index c087b520f..d95df9d8e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ApplicationJob.java @@ -13,6 +13,8 @@ package fr.gouv.etalab.mastodon.jobs; * * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ +import android.support.annotation.NonNull; + import com.evernote.android.job.Job; import com.evernote.android.job.JobCreator; import com.evernote.android.job.JobManager; @@ -24,7 +26,7 @@ import com.evernote.android.job.JobManager; public class ApplicationJob implements JobCreator { @Override - public Job create(String tag) { + public Job create(@NonNull String tag) { switch (tag) { case NotificationsSyncJob.NOTIFICATION_REFRESH: return new NotificationsSyncJob(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index 436654cbb..867fcf6a0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -35,10 +35,6 @@ import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; import com.evernote.android.job.JobRequest; -import org.conscrypt.Conscrypt; - -import java.security.Provider; -import java.security.Security; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java index b5548a800..1bbcc68d8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java @@ -35,10 +35,6 @@ import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; import com.evernote.android.job.JobRequest; -import org.conscrypt.Conscrypt; - -import java.security.Provider; -import java.security.Security; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java index 874773684..c046735b0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/ScheduledTootsSyncJob.java @@ -52,7 +52,7 @@ public class ScheduledTootsSyncJob extends Job { @NonNull @Override - protected Result onRunJob(Params params) { + protected Result onRunJob(@NonNull Params params) { //Code refresh here int jobId = params.getId(); SQLiteDatabase db = Sqlite.getInstance(getContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/BaseService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/BaseService.java index c5848925b..cafd13f0d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/services/BaseService.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/BaseService.java @@ -1,23 +1,23 @@ package fr.gouv.etalab.mastodon.services; +import android.annotation.SuppressLint; import android.app.IntentService; import android.content.Intent; import android.support.annotation.Nullable; -import org.conscrypt.Conscrypt; -import java.security.Security; +import fr.gouv.etalab.mastodon.helper.Helper; /** * Created by Thomas on 13/12/2017. + * BaseService class to install provider */ +@SuppressLint("Registered") public class BaseService extends IntentService { static { - Security.insertProviderAt(Conscrypt.newProvider("GmsCore_OpenSSL"), 2); - Security.addProvider(Conscrypt.newProvider()); - + Helper.installProvider(); } public BaseService(String name) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java index 868002547..4a4e78d41 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java @@ -13,7 +13,7 @@ package fr.gouv.etalab.mastodon.services; * * You should have received a copy of the GNU General Public License along with Mastalab; if not, * see . */ -import android.app.IntentService; + import android.content.Context; import android.content.Intent; import android.content.SharedPreferences;