diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java index 11acc562a..6b7d07cf3 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java +++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java @@ -17,6 +17,7 @@ import javax.inject.Inject; import butterknife.BindView; import butterknife.ButterKnife; import io.github.wulkanowy.R; +import io.github.wulkanowy.services.jobs.SyncJob; import io.github.wulkanowy.ui.base.BaseActivity; import io.github.wulkanowy.ui.base.BasePagerAdapter; import io.github.wulkanowy.ui.main.attendance.AttendanceFragment; @@ -140,6 +141,11 @@ public class MainActivity extends BaseActivity implements MainContract.View, viewPager.setCurrentItem(tabPosition, false); } + @Override + public void startSyncService(int interval, boolean useOnlyWifi) { + SyncJob.start(getApplicationContext(), interval, useOnlyWifi); + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java index d4d8156bf..cc3266548 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java +++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java @@ -18,6 +18,8 @@ public interface MainContract { void initiationViewPager(int tabPosition); void initiationBottomNav(int tabPosition); + + void startSyncService(int interval, boolean useOnlyWifi); } @PerActivity diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java index 3cbbfd864..ba5e41d8e 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java +++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java @@ -32,6 +32,11 @@ public class MainPresenter extends BasePresenter getView().initiationBottomNav(tabPosition); getView().initiationViewPager(tabPosition); + + if (getRepository().getSharedRepo().isServicesEnable()) { + getView().startSyncService(getRepository().getSharedRepo().getServicesInterval(), + getRepository().getSharedRepo().isMobileDisable()); + } } @Override diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java index 4acb5583a..53994a16e 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java +++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java @@ -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; @@ -44,11 +43,6 @@ public class SplashActivity extends BaseActivity implements SplashContract.View finish(); } - @Override - public void startSyncService(int interval, boolean useOnlyWifi) { - SyncJob.start(getApplicationContext(), interval, useOnlyWifi); - } - @Override public void cancelNotifications() { new NotificationService(getApplicationContext()).cancelAll(); diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java index 6d25853e8..58d4447c8 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java +++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java @@ -12,8 +12,6 @@ public interface SplashContract { void openMainActivity(); - void startSyncService(int interval, boolean useOnlyWifi); - void cancelNotifications(); } diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java index 852d4ebef..8d20226fc 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java +++ b/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java @@ -20,11 +20,6 @@ public class SplashPresenter extends BasePresenter super.onStart(activity); getView().cancelNotifications(); - if (getRepository().getSharedRepo().isServicesEnable()) { - getView().startSyncService(getRepository().getSharedRepo().getServicesInterval(), - getRepository().getSharedRepo().isMobileDisable()); - } - if (getRepository().getSharedRepo().isUserLoggedIn()) { getView().openMainActivity(); } else {