From db7e9c8da42d6f8bb9b1b684c70c4b44792f8c62 Mon Sep 17 00:00:00 2001
From: RikkaW <rikka@shizuku.moe>
Date: Fri, 5 Oct 2018 19:51:57 +0800
Subject: [PATCH] fix crash

---
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 manager/build.gradle                          |  4 ++--
 .../shizuku/manager/service/WorkService.java  | 20 +++++++------------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 32b3454a..c7417672 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8b2311b8..32145a3f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Sep 15 16:10:59 CST 2018
+#Sun Sep 30 23:11:47 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/manager/build.gradle b/manager/build.gradle
index c1af1c34..731c328c 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -73,8 +73,8 @@ dependencies {
     implementation "moe.shizuku.preference:preference-dialog-android:$preferenceLibraryVersion"
     implementation "moe.shizuku.preference:preference-simplemenu:$preferenceLibraryVersion"
     implementation "moe.shizuku.support:design:3.0.0"
-    implementation 'moe.shizuku.support:support-utils:3.0.0'
-    implementation 'moe.shizuku.support:recyclerview-utils:3.0.0'
+    implementation 'moe.shizuku.support:support-utils:3.0.2'
+    implementation 'moe.shizuku.support:recyclerview-utils:3.0.2'
     implementation 'moe.shizuku.fontprovider:api:10'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.1'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
diff --git a/manager/src/main/java/moe/shizuku/manager/service/WorkService.java b/manager/src/main/java/moe/shizuku/manager/service/WorkService.java
index 714f47ee..165fe190 100644
--- a/manager/src/main/java/moe/shizuku/manager/service/WorkService.java
+++ b/manager/src/main/java/moe/shizuku/manager/service/WorkService.java
@@ -1,5 +1,6 @@
 package moe.shizuku.manager.service;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -63,20 +64,13 @@ public Notification onStartForeground() {
         return builder.build();
     }
 
+    @TargetApi(Build.VERSION_CODES.O)
     @Override
-    public void onCreate() {
-        super.onCreate();
-
-        NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-
-        if (notificationManager != null
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_WORK, getString(R.string.channel_service_status), NotificationManager.IMPORTANCE_MIN);
-            channel.setSound(null, null);
-            channel.setShowBadge(false);
-
-            notificationManager.createNotificationChannel(channel);
-        }
+    public void onCreateNotificationChannel(NotificationManager notificationManager) {
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_WORK, getString(R.string.channel_service_status), NotificationManager.IMPORTANCE_MIN);
+        channel.setSound(null, null);
+        channel.setShowBadge(false);
+        notificationManager.createNotificationChannel(channel);
     }
 
     @Override