diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 0cd7f6bef7..6023ec75e7 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -348,10 +348,6 @@ android:permission="android.permission.BIND_JOB_SERVICE" android:exported="false"/> - - diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index fafa3044a6..eb80b5c4cd 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -25,8 +25,6 @@ import com.mapswithme.maps.maplayer.isolines.IsolinesManager; import com.mapswithme.maps.maplayer.subway.SubwayManager; import com.mapswithme.maps.maplayer.traffic.TrafficManager; import com.mapswithme.maps.routing.RoutingController; -import com.mapswithme.maps.scheduling.ConnectivityJobScheduler; -import com.mapswithme.maps.scheduling.ConnectivityListener; import com.mapswithme.maps.search.SearchEngine; import com.mapswithme.maps.settings.StoragePathManager; import com.mapswithme.maps.sound.TtsPlayer; @@ -69,9 +67,6 @@ public class MwmApplication extends Application implements AppBackgroundTracker. private Handler mMainLoopHandler; private final Object mMainQueueToken = new Object(); - @SuppressWarnings("NullableProblems") - @NonNull - private ConnectivityListener mConnectivityListener; @NonNull private final MapManager.StorageCallback mStorageCallbacks = new StorageCallbackImpl(); @SuppressWarnings("NullableProblems") @@ -146,8 +141,6 @@ public class MwmApplication extends Application implements AppBackgroundTracker. mSubwayManager = new SubwayManager(this); mIsolinesManager = new IsolinesManager(this); mGuidesManager = new GuidesManager(this); - mConnectivityListener = new ConnectivityJobScheduler(this); - mConnectivityListener.listen(); mPurchaseOperationObservable = new PurchaseOperationObservable(); mPlayer = new MediaPlayerWrapper(this); @@ -317,12 +310,6 @@ public class MwmApplication extends Application implements AppBackgroundTracker. mMainLoopHandler.sendMessage(m); } - @NonNull - public ConnectivityListener getConnectivityListener() - { - return mConnectivityListener; - } - @NonNull public MediaPlayerWrapper getMediaPlayer() { diff --git a/android/src/com/mapswithme/maps/background/NotificationService.java b/android/src/com/mapswithme/maps/background/NotificationService.java index ca46ccb1f2..c3e29859a7 100644 --- a/android/src/com/mapswithme/maps/background/NotificationService.java +++ b/android/src/com/mapswithme/maps/background/NotificationService.java @@ -34,7 +34,7 @@ public class NotificationService extends JobIntentService final Intent intent = new Intent(context, NotificationService.class) .setAction(CONNECTIVITY_ACTION); - int id = JobIdMap.getId(NotificationService.class); + int id = JobIdMap.getId(NotificationService.class.hashCode(); JobIntentService.enqueueWork(context, NotificationService.class, id, intent); } diff --git a/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java b/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java deleted file mode 100644 index e77d2bd266..0000000000 --- a/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.mapswithme.maps.scheduling; - -import android.app.job.JobInfo; -import android.app.job.JobScheduler; -import android.content.ComponentName; -import android.content.Context; - -import androidx.annotation.NonNull; -import com.mapswithme.maps.MwmApplication; - -import java.util.Objects; -import java.util.concurrent.TimeUnit; - -public class ConnectivityJobScheduler implements ConnectivityListener -{ - private static final int SCHEDULE_PERIOD_IN_HOURS = 1; - - @NonNull - private final ConnectivityListener mMasterConnectivityListener; - - public ConnectivityJobScheduler(@NonNull MwmApplication context) - { - mMasterConnectivityListener = createNativeJobScheduler(context); - } - - @NonNull - private ConnectivityListener createNativeJobScheduler(@NonNull MwmApplication context) - { - return new NativeConnectivityListener(context); - } - - @Override - public void listen() - { - mMasterConnectivityListener.listen(); - } - - @NonNull - public static ConnectivityJobScheduler from(@NonNull Context context) - { - MwmApplication application = (MwmApplication) context.getApplicationContext(); - return (ConnectivityJobScheduler) application.getConnectivityListener(); - } - - private static class NativeConnectivityListener implements ConnectivityListener - { - @NonNull - private final JobScheduler mJobScheduler; - @NonNull - private final Context mContext; - - NativeConnectivityListener(@NonNull Context context) - { - mContext = context; - JobScheduler jobScheduler = (JobScheduler) mContext.getSystemService(Context.JOB_SCHEDULER_SERVICE); - Objects.requireNonNull(jobScheduler); - mJobScheduler = jobScheduler; - } - - @Override - public void listen() - { - ComponentName component = new ComponentName(mContext, NativeJobService.class); - int jobId = JobIdMap.getId(NativeJobService.class); - JobInfo jobInfo = new JobInfo - .Builder(jobId, component) - .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) - .setPersisted(true) - .setMinimumLatency(TimeUnit.HOURS.toMillis(SCHEDULE_PERIOD_IN_HOURS)) - .build(); - mJobScheduler.schedule(jobInfo); - } - } -} diff --git a/android/src/com/mapswithme/maps/scheduling/ConnectivityListener.java b/android/src/com/mapswithme/maps/scheduling/ConnectivityListener.java deleted file mode 100644 index a9450e0171..0000000000 --- a/android/src/com/mapswithme/maps/scheduling/ConnectivityListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.mapswithme.maps.scheduling; - -public interface ConnectivityListener -{ - void listen(); -} diff --git a/android/src/com/mapswithme/maps/scheduling/JobIdMap.java b/android/src/com/mapswithme/maps/scheduling/JobIdMap.java index 10acce278a..57012b3cdd 100644 --- a/android/src/com/mapswithme/maps/scheduling/JobIdMap.java +++ b/android/src/com/mapswithme/maps/scheduling/JobIdMap.java @@ -4,7 +4,6 @@ import com.mapswithme.maps.background.NotificationService; import com.mapswithme.maps.background.WorkerService; import com.mapswithme.maps.bookmarks.SystemDownloadCompletedService; import com.mapswithme.maps.location.TrackRecorderWakeService; -import com.mapswithme.util.Utils; import java.util.HashMap; import java.util.Map; @@ -14,7 +13,6 @@ public class JobIdMap private static final Map, Integer> MAP = new HashMap<>(); static { - MAP.put(NativeJobService.class, calcIdentifier(MAP.size())); MAP.put(NotificationService.class, calcIdentifier(MAP.size())); MAP.put(TrackRecorderWakeService.class, calcIdentifier(MAP.size())); MAP.put(SystemDownloadCompletedService.class, calcIdentifier(MAP.size())); diff --git a/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java b/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java deleted file mode 100644 index a29eff11a7..0000000000 --- a/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mapswithme.maps.scheduling; - -import android.app.Application; -import androidx.annotation.NonNull; - -class JobServiceDelegate -{ - @NonNull - private final Application mApp; - - JobServiceDelegate(@NonNull Application app) - { - mApp = app; - } - - boolean onStartJob() - { - retryJob(); - return true; - } - - private void retryJob() - { - ConnectivityJobScheduler.from(mApp).listen(); - } - - boolean onStopJob() - { - return false; - } -} diff --git a/android/src/com/mapswithme/maps/scheduling/NativeJobService.java b/android/src/com/mapswithme/maps/scheduling/NativeJobService.java deleted file mode 100644 index 5bebc26855..0000000000 --- a/android/src/com/mapswithme/maps/scheduling/NativeJobService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.mapswithme.maps.scheduling; - -import android.annotation.TargetApi; -import android.app.job.JobParameters; -import android.app.job.JobService; -import android.os.Build; -import androidx.annotation.NonNull; - -import com.mapswithme.util.log.Logger; -import com.mapswithme.util.log.LoggerFactory; - -public class NativeJobService extends JobService -{ - private static final String TAG = NativeJobService.class.getSimpleName(); - - @SuppressWarnings("NullableProblems") - @NonNull - private JobServiceDelegate mDelegate; - - @Override - public void onCreate() - { - super.onCreate(); - mDelegate = new JobServiceDelegate(getApplication()); - } - - @Override - public boolean onStartJob(JobParameters params) - { - Logger logger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); - logger.d(TAG, "onStartJob"); - return mDelegate.onStartJob(); - } - - @Override - public boolean onStopJob(JobParameters params) - { - return mDelegate.onStopJob(); - } -}