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

Small bug fixes

Browse Source
This commit is contained in:
Caesar2011
2019-02-03 21:09:43 +01:00
parent 0f6a11cf5f
commit 5bf6573baa
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,9 +162,10 @@ public class MainActivity extends AppCompatActivity
if (isPaused) { if (isPaused) {
getKVV().account().restoreOnlineLogin(restoreResult -> { getKVV().account().restoreOnlineLogin(restoreResult -> {
updateNavigation(); updateNavigation();
if (restoreResult == Login.RESTORE_STATUS_SUCCESS && !isLoggedInBeforePause) if (restoreResult == Login.RESTORE_STATUS_SUCCESS && !isLoggedInBeforePause) {
changeFragment(getDefaultFragmentAfterLogin()); changeFragment(getDefaultFragmentAfterLogin());
else if (restoreResult == Login.RESTORE_STATUS_INVALID_PASSWORD && isLoggedInBeforePause) { registerSync();
} else if (restoreResult == Login.RESTORE_STATUS_INVALID_PASSWORD && isLoggedInBeforePause) {
getKVV().account().logout(false); getKVV().account().logout(false);
changeFragment(getDefaultFragmentAfterLogout()); changeFragment(getDefaultFragmentAfterLogout());
} }
@@ -661,9 +662,6 @@ public class MainActivity extends AppCompatActivity
@Override @Override
public void onLogin(LoginTokenKVV token, boolean isOnlyRefresh) { public void onLogin(LoginTokenKVV token, boolean isOnlyRefresh) {
toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin()); toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin());
if (!isOnlyRefresh) {
registerSync();
}
} }
@Override @Override

8
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java
View File

@@ -174,7 +174,13 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
folder.add(resource1); folder.add(resource1);
} }
if (--latch[0] == 0) callback.onResponse(resources); if (--latch[0] == 0) callback.onResponse(resources);
}, errorCallback); }, error -> {
if (error.getHttpStatus() == 403) {
if (--latch[0] == 0) callback.onResponse(resources);
} else {
errorCallback.onError(error);
}
});
} else { } else {
String bodyText = resource.optString("body", ""); String bodyText = resource.optString("body", "");
bodyText = String.valueOf(PartModules.fromHtml(bodyText)); bodyText = String.valueOf(PartModules.fromHtml(bodyText));