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

Stop SyncJob if user is not registered in app (#113)

Browse Source
This commit is contained in:
Rafał Borcz 2018-05-16 20:43:29 +02:00 committed by Mikołaj Pich
parent 3000c077c4
commit 54e6aee82e
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/io/github/wulkanowy/data/sync/AccountSync.java
View File

@ -118,12 +118,12 @@ public class AccountSync {
daoSession.getSemesterDao().insertInTx(semesterList);
}
public void initLastUser() throws IOException, CryptoException {
public void initLastUser() throws CryptoException {
long userId = sharedPref.getCurrentUserId();
if (userId == 0) {
throw new IOException("Can't find saved user");
throw new NotRegisteredUserException("Can't find user id in SharedPreferences");
}
LogUtils.debug("Initialization current user id=" + userId);

8
app/src/main/java/io/github/wulkanowy/data/sync/NotRegisteredUserException.java Normal file
View File

@ -0,0 +1,8 @@
package io.github.wulkanowy.data.sync;
public class NotRegisteredUserException extends RuntimeException {
public NotRegisteredUserException(String message) {
super(message);
}
}

13
app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
View File

@ -24,6 +24,7 @@ import io.github.wulkanowy.R;
import io.github.wulkanowy.WulkanowyApp;
import io.github.wulkanowy.data.RepositoryContract;
import io.github.wulkanowy.data.db.dao.entities.Grade;
import io.github.wulkanowy.data.sync.NotRegisteredUserException;
import io.github.wulkanowy.services.notifies.GradeNotify;
import io.github.wulkanowy.ui.main.MainActivity;
import io.github.wulkanowy.utils.LogUtils;
@ -74,9 +75,12 @@ public class SyncJob extends SimpleJobService {
showNotification();
}
return JobService.RESULT_SUCCESS;
} catch (NotRegisteredUserException e) {
logError(e);
stop(getApplicationContext());
return JobService.RESULT_FAIL_NORETRY;
} catch (Exception e) {
Crashlytics.logException(e);
LogUtils.error("During background synchronization an error occurred", e);
logError(e);
return JobService.RESULT_FAIL_RETRY;
}
}
@ -116,4 +120,9 @@ public class SyncJob extends SimpleJobService {
gradeList.size(), gradeList.size());
}
}
private void logError(Exception e) {
Crashlytics.logException(e);
LogUtils.error("During background synchronization an error occurred", e);
}
}

6
app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java
View File

@ -5,7 +5,6 @@ import android.os.Bundle;
import javax.inject.Inject;
import butterknife.ButterKnife;
import io.github.wulkanowy.services.jobs.SyncJob;
import io.github.wulkanowy.services.notifies.NotificationService;
import io.github.wulkanowy.ui.base.BaseActivity;
import io.github.wulkanowy.ui.login.LoginActivity;
@ -48,9 +47,4 @@ public class SplashActivity extends BaseActivity implements SplashContract.View
public void cancelNotifications() {
new NotificationService(getApplicationContext()).cancelAll();
}
@Override
public void stopSyncService() {
SyncJob.stop(getApplicationContext());
}
}

2
app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java
View File

@ -13,8 +13,6 @@ public interface SplashContract {
void openMainActivity();
void cancelNotifications();
void stopSyncService();
}
@PerActivity

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

@ -24,7 +24,6 @@ public class SplashPresenter extends BasePresenter<SplashContract.View>
getView().openMainActivity();
} else {
getView().openLoginActivity();
getView().stopSyncService();
}
}
}