sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused Offline Mode

Browse Source
This commit is contained in:
Sebastian Seedorf
2019-01-03 11:59:24 +01:00
parent 22f7cf3e96
commit 73f9485394
5 changed files with 10 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -85,7 +85,6 @@ public class MainActivity extends AppCompatActivity
@NotNull
private String mFragmentData = "";
private final HashMap<String, RequestPermissionsResultListener> 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

2
app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java
View File

@@ -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();

21
app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java
View File

@@ -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<LoginToken> 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<LoginToken> 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();
}

2
app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
View File

@@ -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) {
}

11
app/src/main/res/layout/app_bar_main.xml
View File

@@ -18,17 +18,6 @@
android:background="@color/colorFUGreen"
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
android:id="@+id/no_connection_msg"
android:layout_width="match_parent"