From c67fa5f070603914d3d1301e9cb306a38c875d7f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 11 Jul 2018 09:56:07 +0300
Subject: use JobIntentService for cache cleanup service

---
 org.fox.ttcomics/src/main/AndroidManifest.xml               |  2 ++
 .../src/main/java/org/fox/ttcomics2/CommonActivity.java     |  4 ++--
 .../java/org/fox/ttcomics2/utils/CacheCleanupService.java   | 13 +++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index e34f5c4..69b9bd9 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     
     <application
 	    android:name=".Application"
@@ -65,6 +66,7 @@
 
         <service
             android:name=".utils.CacheCleanupService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"/>
 
         <provider
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index d52f8d5..288c794 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.JobIntentService;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MenuItem;
@@ -199,8 +200,7 @@ public class CommonActivity extends AppCompatActivity {
 	}
 
 	public void cleanupCache() {
-		Intent intent = new Intent(CommonActivity.this, CacheCleanupService.class);
-		startService(intent);
+		JobIntentService.enqueueWork(getApplicationContext(), CacheCleanupService.class, 0, new Intent());
 	}
 
 	@Override
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java
index 3067f21..d68e039 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java
@@ -1,8 +1,8 @@
 package org.fox.ttcomics2.utils;
 
-import android.app.IntentService;
 import android.content.Intent;
 import android.os.Environment;
+import android.support.v4.app.JobIntentService;
 import android.util.Log;
 
 import org.fox.ttcomics2.CommonActivity;
@@ -12,22 +12,15 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-public class CacheCleanupService extends IntentService {
+public class CacheCleanupService extends JobIntentService {
     private final String TAG = this.getClass().getSimpleName();
 
-    public CacheCleanupService() {
-        super("CacheCleanupService");
-    }
-    public CacheCleanupService(String name) {
-        super(name);
-    }
-
     public static boolean isStorageWritable() {
         String state = Environment.getExternalStorageState();
         return Environment.MEDIA_MOUNTED.equals(state);
     }
     @Override
-    protected void onHandleIntent(Intent workIntent) {
+    protected void onHandleWork(Intent workIntent) {
         Log.d(TAG, "starting...");
 
         if (isStorageWritable()) {
-- 
cgit v1.2.3