From 1d70d0fe940d3df74b152a9bf08dfd6ead7bfdf6 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 17 Feb 2017 09:26:17 +0800
Subject: [PATCH] Don't show notification again if coming from notification

---
 .../com/topjohnwu/magisk/MagiskManager.java   |  1 -
 .../com/topjohnwu/magisk/SplashActivity.java  | 20 ++++++++++---------
 .../topjohnwu/magisk/asyncs/CheckUpdates.java |  3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 8a8fb11f1..172476cdc 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -47,7 +47,6 @@ public class MagiskManager extends Application {
     public boolean isSuClient = false;
     public String suVersion = null;
     public boolean disabled = false;
-    public boolean isNotified = false;
 
     // Data
     public ValueSortedMap<String, Repo> repoMap;
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
index 9902d20ff..737c29ea5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -39,14 +39,16 @@ public class SplashActivity extends Activity{
         boolean started = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
 
         // Initialize the update check service, notify every 3 hours
-        ComponentName service = new ComponentName(magiskManager, UpdateCheckService.class);
-        JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
-                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                .setPersisted(true)
-                .setPeriodic(3 * 60 * 60 * 1000)
-                .build();
-        JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
-        scheduler.schedule(jobInfo);
+        if (!"install".equals(getIntent().getStringExtra(MainActivity.SECTION))) {
+            ComponentName service = new ComponentName(magiskManager, UpdateCheckService.class);
+            JobInfo jobInfo = new JobInfo.Builder(UPDATE_SERVICE_ID, service)
+                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                    .setPersisted(true)
+                    .setPeriodic(3 * 60 * 60 * 1000)
+                    .build();
+            JobScheduler scheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+            scheduler.schedule(jobInfo);
+        }
 
         // Now fire all async tasks
         new GetBootBlocks(this).exec();
@@ -62,7 +64,7 @@ public class SplashActivity extends Activity{
             }
         }.exec();
         new LoadApps(this).exec();
-        new CheckUpdates(this, true){
+        new CheckUpdates(this, !"install".equals(getIntent().getStringExtra(MainActivity.SECTION))){
             @Override
             protected void onPostExecute(Void v) {
                 super.onPostExecute(v);
diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
index 87ecb433d..a36aa6ebd 100644
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
@@ -25,7 +25,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
 
     public CheckUpdates(Context context, boolean b) {
         this(context);
-        showNotification = b && !magiskManager.isNotified;
+        showNotification = b;
     }
 
     public CheckUpdates(Context context) {
@@ -49,7 +49,6 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
     @Override
     protected void onPostExecute(Void v) {
         if (magiskManager.magiskVersion < magiskManager.remoteMagiskVersion && showNotification) {
-            magiskManager.isNotified = true;
             NotificationCompat.Builder builder = new NotificationCompat.Builder(magiskManager);
             builder.setSmallIcon(R.drawable.ic_magisk)
                     .setContentTitle(magiskManager.getString(R.string.magisk_update_title))