From a22fcc9064f6fca227a69d03b7d1350d3945f05d Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 2 Jan 2020 20:05:10 +0100 Subject: [PATCH] Simplification --- .../eu/faircode/email/FragmentCompose.java | 11 ++-------- .../eu/faircode/email/FragmentMessages.java | 11 ++-------- .../email/FragmentOptionsConnection.java | 21 ++++++------------- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index d97acb7adb..e9d837de32 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -917,15 +917,8 @@ public class FragmentCompose extends FragmentBase { } private void check() { - Activity activity = getActivity(); - if (activity != null) - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - checkInternet(); - } - }); + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + checkInternet(); } }; diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 356b529510..7d091e27dd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2734,15 +2734,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } private void check() { - Activity activity = getActivity(); - if (activity != null) - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - adapter.checkInternet(); - } - }); + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + adapter.checkInternet(); } }; diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java index 8f6ab4341f..cabd28070d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java @@ -277,21 +277,12 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre }; private void showConnectionType() { - FragmentActivity activity = getActivity(); - if (activity == null) - return; + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { + ConnectionHelper.NetworkState networkState = ConnectionHelper.getNetworkState(getContext()); - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { - ConnectionHelper.NetworkState networkState = ConnectionHelper.getNetworkState(getContext()); - - tvConnectionType.setText(networkState.isUnmetered() ? R.string.title_legend_unmetered : R.string.title_legend_metered); - tvConnectionType.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE); - tvConnectionRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE); - } - } - }); + tvConnectionType.setText(networkState.isUnmetered() ? R.string.title_legend_unmetered : R.string.title_legend_metered); + tvConnectionType.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE); + tvConnectionRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE); + } } }