From 73f9485394a9d6c96e591796068c05f08be67c2e Mon Sep 17 00:00:00 2001 From: Sebastian Seedorf Date: Thu, 3 Jan 2019 11:59:24 +0100 Subject: [PATCH] Removed unused Offline Mode --- .../java/de/sebse/fuplanner/MainActivity.java | 17 ++++----------- .../fuplanner/services/kvv/KVVListener.java | 2 +- .../sebse/fuplanner/services/kvv/Login.java | 21 ++++--------------- .../services/kvv/sync/KVVSyncAdapter.java | 2 +- app/src/main/res/layout/app_bar_main.xml | 11 ---------- 5 files changed, 10 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 1c243ed..0cd5b87 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -85,7 +85,6 @@ public class MainActivity extends AppCompatActivity @NotNull private String mFragmentData = ""; private final HashMap permissionListeners = new HashMap<>(); - private boolean mOfflineBanner; private final NewAsyncQueue mQueue = new NewAsyncQueue(); private long mDoubleBackToExitPressedOnce = 0; private CustomAccountManager mAccountManager; @@ -335,15 +334,13 @@ public class MainActivity extends AppCompatActivity } private void toLogoutState() { - setOfflineBanner(false); setRefreshFailedBanner(false); updateNavigation(); changeFragment(getDefaultFragmentAfterLogout()); mAccountManager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, null); } - private void toLoginState(String fullName, String email, int newFragment, boolean onlineMode) { - setOfflineBanner(!onlineMode); + private void toLoginState(String fullName, String email, int newFragment) { updateNavigation(); View header = mNavigationView.getHeaderView(0); @@ -415,15 +412,9 @@ public class MainActivity extends AppCompatActivity invalidateOptionsMenu(); } - private void setOfflineBanner(boolean visible) { - View offline_header = findViewById(R.id.offline_msg); - offline_header.setVisibility(visible ? View.VISIBLE : View.GONE); - mOfflineBanner = visible; - } - private void setRefreshFailedBanner(boolean refreshFailed) { View viewNoConnection = findViewById(R.id.no_connection_msg); - if (!mOfflineBanner && refreshFailed) + if (refreshFailed) viewNoConnection.setVisibility(View.VISIBLE); else viewNoConnection.setVisibility(View.GONE); @@ -644,8 +635,8 @@ public class MainActivity extends AppCompatActivity @Override - public void onLogin(LoginToken token, boolean enteringOnlineMode) { - toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin(), enteringOnlineMode); + public void onLogin(LoginToken token) { + toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin()); } @Override diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java index ffe2a81c..b49aef1 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java @@ -6,7 +6,7 @@ import de.sebse.fuplanner.services.kvv.types.LoginToken; import de.sebse.fuplanner.tools.CustomAccountManager; public interface KVVListener { - void onLogin(LoginToken token, boolean enteringOnlineMode); + void onLogin(LoginToken token); void onLogout(); diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java index cda072c..206eaf5 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java @@ -18,7 +18,6 @@ public class Login extends HTTPService { private final KVVListener mListener; @Nullable private LoginToken mToken; private boolean mLoginPending = false; - private boolean mOnlineMode = false; private final NetworkCallbackCollector mRefreshCallbacks = new NetworkCallbackCollector<>(); Login(KVVListener listener, Context context) { @@ -26,13 +25,6 @@ public class Login extends HTTPService { this.mListener = listener; } - @Deprecated - public void reset() { - mToken = null; - mLoginPending = false; - mOnlineMode = false; - } - public void restoreOnlineLogin(BooleanInterface callback) { if (mLoginPending) { callback.run(false); @@ -40,7 +32,7 @@ public class Login extends HTTPService { } mLoginPending = true; LoginToken.load(mListener.getAccountManager(), token -> { - boolean result = setToken(token, true); + boolean result = setToken(token); mLoginPending = false; log.d("loginToken", token != null ? token.toString() : null); callback.run(result); @@ -72,12 +64,8 @@ public class Login extends HTTPService { return mToken != null; } - public boolean isInOfflineMode() { - return isLoggedIn() && !mOnlineMode; - } - public boolean isInOnlineMode() { - return isLoggedIn() && mOnlineMode; + return isLoggedIn(); } void testLoginToken(@NotNull NetworkCallback callback, @NotNull NetworkErrorCallback errorCallback) { @@ -118,7 +106,7 @@ public class Login extends HTTPService { private boolean handleCallbacks() { if (mToken != null) { - mListener.onLogin(mToken, mOnlineMode); + mListener.onLogin(mToken); return true; } else { mListener.onLogout(); @@ -126,12 +114,11 @@ public class Login extends HTTPService { } } - private boolean setToken(@Nullable LoginToken token, boolean enteringOnlineMode) { + private boolean setToken(@Nullable LoginToken token) { if (token == null) return false; boolean isOnlyRefresh = mToken != null; mToken = token; - mOnlineMode = enteringOnlineMode; return isOnlyRefresh || handleCallbacks(); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java index e9e3d51..2f77278 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java @@ -49,7 +49,7 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter { CountDownLatch latch = new CountDownLatch(1); mKVV = new KVV(new KVVListener() { @Override - public void onLogin(LoginToken token, boolean enteringOnlineMode) { + public void onLogin(LoginToken token) { } diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 484decf..f365d85 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -18,17 +18,6 @@ android:background="@color/colorFUGreen" app:popupTheme="@style/AppTheme.PopupOverlay" /> - -