Removed unused Offline Mode
This commit is contained in:
@@ -85,7 +85,6 @@ public class MainActivity extends AppCompatActivity
|
|||||||
@NotNull
|
@NotNull
|
||||||
private String mFragmentData = "";
|
private String mFragmentData = "";
|
||||||
private final HashMap<String, RequestPermissionsResultListener> permissionListeners = new HashMap<>();
|
private final HashMap<String, RequestPermissionsResultListener> permissionListeners = new HashMap<>();
|
||||||
private boolean mOfflineBanner;
|
|
||||||
private final NewAsyncQueue mQueue = new NewAsyncQueue();
|
private final NewAsyncQueue mQueue = new NewAsyncQueue();
|
||||||
private long mDoubleBackToExitPressedOnce = 0;
|
private long mDoubleBackToExitPressedOnce = 0;
|
||||||
private CustomAccountManager mAccountManager;
|
private CustomAccountManager mAccountManager;
|
||||||
@@ -335,15 +334,13 @@ public class MainActivity extends AppCompatActivity
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void toLogoutState() {
|
private void toLogoutState() {
|
||||||
setOfflineBanner(false);
|
|
||||||
setRefreshFailedBanner(false);
|
setRefreshFailedBanner(false);
|
||||||
updateNavigation();
|
updateNavigation();
|
||||||
changeFragment(getDefaultFragmentAfterLogout());
|
changeFragment(getDefaultFragmentAfterLogout());
|
||||||
mAccountManager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, null);
|
mAccountManager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void toLoginState(String fullName, String email, int newFragment, boolean onlineMode) {
|
private void toLoginState(String fullName, String email, int newFragment) {
|
||||||
setOfflineBanner(!onlineMode);
|
|
||||||
updateNavigation();
|
updateNavigation();
|
||||||
|
|
||||||
View header = mNavigationView.getHeaderView(0);
|
View header = mNavigationView.getHeaderView(0);
|
||||||
@@ -415,15 +412,9 @@ public class MainActivity extends AppCompatActivity
|
|||||||
invalidateOptionsMenu();
|
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) {
|
private void setRefreshFailedBanner(boolean refreshFailed) {
|
||||||
View viewNoConnection = findViewById(R.id.no_connection_msg);
|
View viewNoConnection = findViewById(R.id.no_connection_msg);
|
||||||
if (!mOfflineBanner && refreshFailed)
|
if (refreshFailed)
|
||||||
viewNoConnection.setVisibility(View.VISIBLE);
|
viewNoConnection.setVisibility(View.VISIBLE);
|
||||||
else
|
else
|
||||||
viewNoConnection.setVisibility(View.GONE);
|
viewNoConnection.setVisibility(View.GONE);
|
||||||
@@ -644,8 +635,8 @@ public class MainActivity extends AppCompatActivity
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLogin(LoginToken token, boolean enteringOnlineMode) {
|
public void onLogin(LoginToken token) {
|
||||||
toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin(), enteringOnlineMode);
|
toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import de.sebse.fuplanner.services.kvv.types.LoginToken;
|
|||||||
import de.sebse.fuplanner.tools.CustomAccountManager;
|
import de.sebse.fuplanner.tools.CustomAccountManager;
|
||||||
|
|
||||||
public interface KVVListener {
|
public interface KVVListener {
|
||||||
void onLogin(LoginToken token, boolean enteringOnlineMode);
|
void onLogin(LoginToken token);
|
||||||
|
|
||||||
void onLogout();
|
void onLogout();
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ public class Login extends HTTPService {
|
|||||||
private final KVVListener mListener;
|
private final KVVListener mListener;
|
||||||
@Nullable private LoginToken mToken;
|
@Nullable private LoginToken mToken;
|
||||||
private boolean mLoginPending = false;
|
private boolean mLoginPending = false;
|
||||||
private boolean mOnlineMode = false;
|
|
||||||
private final NetworkCallbackCollector<LoginToken> mRefreshCallbacks = new NetworkCallbackCollector<>();
|
private final NetworkCallbackCollector<LoginToken> mRefreshCallbacks = new NetworkCallbackCollector<>();
|
||||||
|
|
||||||
Login(KVVListener listener, Context context) {
|
Login(KVVListener listener, Context context) {
|
||||||
@@ -26,13 +25,6 @@ public class Login extends HTTPService {
|
|||||||
this.mListener = listener;
|
this.mListener = listener;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public void reset() {
|
|
||||||
mToken = null;
|
|
||||||
mLoginPending = false;
|
|
||||||
mOnlineMode = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void restoreOnlineLogin(BooleanInterface callback) {
|
public void restoreOnlineLogin(BooleanInterface callback) {
|
||||||
if (mLoginPending) {
|
if (mLoginPending) {
|
||||||
callback.run(false);
|
callback.run(false);
|
||||||
@@ -40,7 +32,7 @@ public class Login extends HTTPService {
|
|||||||
}
|
}
|
||||||
mLoginPending = true;
|
mLoginPending = true;
|
||||||
LoginToken.load(mListener.getAccountManager(), token -> {
|
LoginToken.load(mListener.getAccountManager(), token -> {
|
||||||
boolean result = setToken(token, true);
|
boolean result = setToken(token);
|
||||||
mLoginPending = false;
|
mLoginPending = false;
|
||||||
log.d("loginToken", token != null ? token.toString() : null);
|
log.d("loginToken", token != null ? token.toString() : null);
|
||||||
callback.run(result);
|
callback.run(result);
|
||||||
@@ -72,12 +64,8 @@ public class Login extends HTTPService {
|
|||||||
return mToken != null;
|
return mToken != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInOfflineMode() {
|
|
||||||
return isLoggedIn() && !mOnlineMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isInOnlineMode() {
|
public boolean isInOnlineMode() {
|
||||||
return isLoggedIn() && mOnlineMode;
|
return isLoggedIn();
|
||||||
}
|
}
|
||||||
|
|
||||||
void testLoginToken(@NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
|
void testLoginToken(@NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
|
||||||
@@ -118,7 +106,7 @@ public class Login extends HTTPService {
|
|||||||
|
|
||||||
private boolean handleCallbacks() {
|
private boolean handleCallbacks() {
|
||||||
if (mToken != null) {
|
if (mToken != null) {
|
||||||
mListener.onLogin(mToken, mOnlineMode);
|
mListener.onLogin(mToken);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
mListener.onLogout();
|
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)
|
if (token == null)
|
||||||
return false;
|
return false;
|
||||||
boolean isOnlyRefresh = mToken != null;
|
boolean isOnlyRefresh = mToken != null;
|
||||||
mToken = token;
|
mToken = token;
|
||||||
mOnlineMode = enteringOnlineMode;
|
|
||||||
return isOnlyRefresh || handleCallbacks();
|
return isOnlyRefresh || handleCallbacks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
|
|||||||
CountDownLatch latch = new CountDownLatch(1);
|
CountDownLatch latch = new CountDownLatch(1);
|
||||||
mKVV = new KVV(new KVVListener() {
|
mKVV = new KVV(new KVVListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onLogin(LoginToken token, boolean enteringOnlineMode) {
|
public void onLogin(LoginToken token) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,17 +18,6 @@
|
|||||||
android:background="@color/colorFUGreen"
|
android:background="@color/colorFUGreen"
|
||||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/offline_msg"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="@color/colorFURed"
|
|
||||||
android:textColor="@color/colorFUWhite"
|
|
||||||
android:gravity="center"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:text="@string/offline_mode" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/no_connection_msg"
|
android:id="@+id/no_connection_msg"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
Reference in New Issue
Block a user