sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix session handling (#67)

Browse Source
This commit is contained in:
Rafał Borcz 2018-03-13 18:19:04 +01:00 committed by Mikołaj Pich
parent 83b4f359bc
commit c9bdac6a66
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
View File

@ -16,6 +16,7 @@ import io.github.wulkanowy.data.RepositoryContract;
import io.github.wulkanowy.di.component.ApplicationComponent; import io.github.wulkanowy.di.component.ApplicationComponent;
import io.github.wulkanowy.di.component.DaggerApplicationComponent; import io.github.wulkanowy.di.component.DaggerApplicationComponent;
import io.github.wulkanowy.di.modules.ApplicationModule; import io.github.wulkanowy.di.modules.ApplicationModule;
import io.github.wulkanowy.utils.LogUtils;
public class WulkanowyApp extends Application { public class WulkanowyApp extends Application {
@ -37,6 +38,17 @@ public class WulkanowyApp extends Application {
enableDebugLog(); enableDebugLog();
} }
initializeFabric(); initializeFabric();
initializeUserSession();
}
private void initializeUserSession() {
if (repository.getCurrentUserId() != 0) {
try {
repository.initLastUser();
} catch (Exception e) {
LogUtils.error("An error occurred when the application was started", e);
}
}
} }
private void enableDebugLog() { private void enableDebugLog() {

2
app/src/main/java/io/github/wulkanowy/ui/main/grades/GradesSubItem.java
View File

@ -37,7 +37,7 @@ public class GradesSubItem
return grade; return grade;
} }
public void setSubjectAlertImage(View subjectAlertImage) { void setSubjectAlertImage(View subjectAlertImage) {
this.subjectAlertImage = subjectAlertImage; this.subjectAlertImage = subjectAlertImage;
} }

8
app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java
View File

@ -6,7 +6,6 @@ import javax.inject.Inject;
import io.github.wulkanowy.data.RepositoryContract; import io.github.wulkanowy.data.RepositoryContract;
import io.github.wulkanowy.ui.base.BasePresenter; import io.github.wulkanowy.ui.base.BasePresenter;
import io.github.wulkanowy.utils.LogUtils;
public class SplashPresenter extends BasePresenter<SplashContract.View> public class SplashPresenter extends BasePresenter<SplashContract.View>
implements SplashContract.Presenter { implements SplashContract.Presenter {
@ -24,12 +23,7 @@ public class SplashPresenter extends BasePresenter<SplashContract.View>
if (getRepository().getCurrentUserId() == 0) { if (getRepository().getCurrentUserId() == 0) {
getView().openLoginActivity(); getView().openLoginActivity();
} else { } else {
try { getView().openMainActivity();
getRepository().initLastUser();
getView().openMainActivity();
} catch (Exception e) {
LogUtils.error("An error occurred when the application was started", e);
}
} }
} }
} }