Merge pull request #18 in ANDROID/content-blocker from fix/147 to master

* commit '36b82254ca6255a9c9ed127e3cadca49ec83138c':
  #147 Minor fix
  #147 Fixed automatic updating of filters
  Update README.md

Author: Nikolay Kartysov

README.md

@@ -16,7 +16,7 @@ To see the 'big picture', to watch current progress and to get an idea of approx
 
 ### Releases
 
- * Latest version: [2.2.2](https://github.com/AdguardTeam/ContentBlocker/releases/tag/v2.2.2)
+ * Latest version: [2.2.3](https://github.com/AdguardTeam/ContentBlocker/releases/tag/v2.2.3)
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
       alt="Get it on Google Play"

adguard_cb/build.gradle

@@ -18,7 +18,7 @@ android {
     defaultConfig {
         targetSdkVersion 27
         applicationId 'com.adguard.android.contentblocker'
-        versionName "2.2.3"
+        versionName "2.2.4"
         signingConfig signingConfigs.config
     }
 
@@ -55,13 +55,13 @@ android {
 
         yandex_api16 {
             minSdkVersion 16
-            versionCode 16002203
+            versionCode 16002204
             dimension "buildChannel"
         }
 
         samsung_api21 {
             minSdkVersion 21
-            versionCode 21002203
+            versionCode 21002204
             dimension "buildChannel"
         }
 

adguard_cb/src/main/AndroidManifest.xml

@@ -3,8 +3,9 @@
           android:installLocation="internalOnly"
           package="com.adguard.android.contentblocker">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="com.samsung.android.sbrowser.permission.CONTENTBLOCKER"/>
+
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 

adguard_cb/src/main/java/com/adguard/android/contentblocker/FilterUpdateJobService.java

@@ -16,31 +16,52 @@ This file is part of AdGuard Content Blocker (https://github.com/AdguardTeam/Con
  */
 package com.adguard.android.contentblocker;
 
+import android.annotation.SuppressLint;
 import android.app.job.JobParameters;
 import android.app.job.JobService;
+import android.os.AsyncTask;
 
 import com.adguard.android.contentblocker.service.FilterService;
 
 public class FilterUpdateJobService extends JobService {
-
-    private FilterService filterService;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        filterService = ServiceLocator.getInstance(getApplicationContext()).getFilterService();
-    }
+    private FilterUpdateTask filterUpdateTask;
 
     @Override
     public boolean onStartJob(JobParameters jobParameters) {
+        filterUpdateTask = new FilterUpdateTask();
+        filterUpdateTask.execute(jobParameters);
 
-        filterService.tryUpdateFilters();
         return true;
     }
 
     @Override
     public boolean onStopJob(JobParameters jobParameters) {
-        jobFinished(jobParameters, true);
+        if (!filterUpdateTask.isCancelled()) {
+            filterUpdateTask.cancel(true);
+        }
+
         return true;
     }
+
+    @SuppressLint("StaticFieldLeak")
+    private class FilterUpdateTask extends AsyncTask<JobParameters, Void, Void> {
+        private JobParameters jobParameters;
+
+        @Override
+        protected Void doInBackground(JobParameters... jobParameters) {
+            if (jobParameters != null) {
+                this.jobParameters = jobParameters[0];
+            }
+
+            FilterService filterService = ServiceLocator.getInstance(getApplicationContext()).getFilterService();
+            filterService.tryUpdateFilters();
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            jobFinished(jobParameters, true);
+        }
+    }
 }