From 75a44fb30a241cf6f09d3fc3a7356fcf45627008 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sat, 11 Aug 2018 19:13:52 +0530
Subject: [PATCH 01/29] Added HTTPS request to get version data. Added APK
 flaor for github and fdroid.

---
 app/build.gradle                              |  17 +++
 .../java/org/schabi/newpipe/MainActivity.java | 111 ++++++++++++++++++
 build.gradle                                  |   2 +-
 3 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a5ff67bee..7264c0ab9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,12 +14,14 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
         debug {
             multiDexEnabled true
 
@@ -34,10 +36,25 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    flavorDimensions "apkSource"
+    productFlavors {
+        github {
+            dimension "apkSource"
+            applicationIdSuffix ".github"
+
+        }
+
+        fdroid {
+            dimension "apkSource"
+            applicationIdSuffix ".fdroid"
+        }
+    }
 }
 
 ext {
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 0ce6772bb..4dba91706 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -47,6 +48,8 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.fragments.BackPressable;
@@ -61,6 +64,13 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -80,6 +90,10 @@ public class MainActivity extends AppCompatActivity {
 
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
+        if (BuildConfig.FLAVOR.equals("github")) {
+            new versionCheckTask().execute();
+        }
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -409,4 +423,101 @@ public class MainActivity extends AppCompatActivity {
             NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
+
+    /**
+     * AsyncTask to check if there is a newer version of the github apk available or not.
+     * If there is a newer version we show a notification, informing the user. On tapping
+     * the notification, the user will be directed to download link.
+     */
+    private static class versionCheckTask extends AsyncTask<Void, Void, String> {
+
+        String newPipeApiUrl = "https://api.myjson.com/bins/19gx44";
+        int timeoutPeriod = 10000;
+
+        @Override
+        protected String doInBackground(Void... voids) {
+
+            String output;
+
+            HttpURLConnection connection = null;
+
+            try {
+
+                URL url = new URL(newPipeApiUrl);
+
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setRequestMethod("GET");
+                connection.setConnectTimeout(timeoutPeriod);
+                connection.setReadTimeout(timeoutPeriod);
+                connection.setRequestProperty("Content-length", "0");
+                connection.setUseCaches(false);
+                connection.setAllowUserInteraction(false);
+                connection.connect();
+
+                int responseStatus = connection.getResponseCode();
+
+                switch (responseStatus) {
+
+                    case 200:
+                    case 201:
+                        BufferedReader bufferedReader
+                                = new BufferedReader(
+                                new InputStreamReader(connection.getInputStream()));
+
+                        StringBuilder stringBuilder = new StringBuilder();
+
+                        String line;
+
+                        while ((line = bufferedReader.readLine()) != null) {
+                            stringBuilder.append(line + "\n");
+                        }
+
+                        bufferedReader.close();
+                        output = stringBuilder.toString();
+
+                        return output;
+                }
+            } catch (MalformedURLException ex) {
+                ex.printStackTrace();
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            } finally {
+                if (connection != null) {
+                    try {
+                        connection.disconnect();
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(String output) {
+
+            if (output != null) {
+
+                Log.i("output---", output);
+
+                try {
+                    JSONObject mainObject = new JSONObject(output);
+                    JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                    JSONObject githubObject = flavoursObject.getJSONObject("github");
+                    JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                    String version = githubStableObject.getString("version");
+                    // String versionCode = githubStableObject.getString("version_code");
+                    String apkLocationUrl = githubStableObject.getString("apk");
+
+                    Log.i("jsonConvert---", version + "     " + apkLocationUrl);
+                } catch (JSONException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+    }
+
+
 }
diff --git a/build.gradle b/build.gradle
index a45c00aef..20c8a0dfc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 5e2aa51627846afbf86fd8c34e94c4b09628cd5b Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sat, 11 Aug 2018 19:36:23 +0530
Subject: [PATCH 02/29] Moved the asynctask to its own class.

---
 .../schabi/newpipe/FetchAppVersionTask.java   | 118 ++++++++++++++++++
 .../java/org/schabi/newpipe/MainActivity.java | 109 +---------------
 2 files changed, 119 insertions(+), 108 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java

diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
new file mode 100644
index 000000000..2f98fe1ad
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
@@ -0,0 +1,118 @@
+package org.schabi.newpipe;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * AsyncTask to check if there is a newer version of the github apk available or not.
+ * If there is a newer version we show a notification, informing the user. On tapping
+ * the notification, the user will be directed to download link.
+ */
+public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
+
+    private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private int timeoutPeriod = 10000;
+
+    @Override
+    protected String doInBackground(Void... voids) {
+
+        String output;
+
+        HttpURLConnection connection = null;
+
+        try {
+
+            URL url = new URL(newPipeApiUrl);
+
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(timeoutPeriod);
+            connection.setReadTimeout(timeoutPeriod);
+            connection.setRequestProperty("Content-length", "0");
+            connection.setUseCaches(false);
+            connection.setAllowUserInteraction(false);
+            connection.connect();
+
+            int responseStatus = connection.getResponseCode();
+
+            switch (responseStatus) {
+
+                case 200:
+                case 201:
+                    BufferedReader bufferedReader
+                            = new BufferedReader(
+                            new InputStreamReader(connection.getInputStream()));
+
+                    StringBuilder stringBuilder = new StringBuilder();
+
+                    String line;
+
+                    while ((line = bufferedReader.readLine()) != null) {
+                        stringBuilder.append(line + "\n");
+                    }
+
+                    bufferedReader.close();
+                    output = stringBuilder.toString();
+
+                    return output;
+            }
+        } catch (MalformedURLException ex) {
+            ex.printStackTrace();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        } finally {
+            if (connection != null) {
+                try {
+                    connection.disconnect();
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(String output) {
+
+        if (output != null) {
+
+            Log.i("output---", output);
+
+            try {
+                JSONObject mainObject = new JSONObject(output);
+                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                JSONObject githubObject = flavoursObject.getJSONObject("github");
+                JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                String versionName = githubStableObject.getString("version");
+                // String versionCode = githubStableObject.getString("version_code");
+                String apkLocationUrl = githubStableObject.getString("apk");
+
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl);
+
+            } catch (JSONException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    private void compareAppVersionAndShowNotification(String versionName, String apkLocationUrl) {
+
+        if (!BuildConfig.VERSION_NAME.equals(versionName)) {
+
+
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 4dba91706..1554dddc0 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -48,8 +47,6 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.fragments.BackPressable;
@@ -64,13 +61,6 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -91,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
         if (BuildConfig.FLAVOR.equals("github")) {
-            new versionCheckTask().execute();
+            new FetchAppVersionTask().execute();
         }
 
         super.onCreate(savedInstanceState);
@@ -423,101 +413,4 @@ public class MainActivity extends AppCompatActivity {
             NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
-
-    /**
-     * AsyncTask to check if there is a newer version of the github apk available or not.
-     * If there is a newer version we show a notification, informing the user. On tapping
-     * the notification, the user will be directed to download link.
-     */
-    private static class versionCheckTask extends AsyncTask<Void, Void, String> {
-
-        String newPipeApiUrl = "https://api.myjson.com/bins/19gx44";
-        int timeoutPeriod = 10000;
-
-        @Override
-        protected String doInBackground(Void... voids) {
-
-            String output;
-
-            HttpURLConnection connection = null;
-
-            try {
-
-                URL url = new URL(newPipeApiUrl);
-
-                connection = (HttpURLConnection) url.openConnection();
-                connection.setRequestMethod("GET");
-                connection.setConnectTimeout(timeoutPeriod);
-                connection.setReadTimeout(timeoutPeriod);
-                connection.setRequestProperty("Content-length", "0");
-                connection.setUseCaches(false);
-                connection.setAllowUserInteraction(false);
-                connection.connect();
-
-                int responseStatus = connection.getResponseCode();
-
-                switch (responseStatus) {
-
-                    case 200:
-                    case 201:
-                        BufferedReader bufferedReader
-                                = new BufferedReader(
-                                new InputStreamReader(connection.getInputStream()));
-
-                        StringBuilder stringBuilder = new StringBuilder();
-
-                        String line;
-
-                        while ((line = bufferedReader.readLine()) != null) {
-                            stringBuilder.append(line + "\n");
-                        }
-
-                        bufferedReader.close();
-                        output = stringBuilder.toString();
-
-                        return output;
-                }
-            } catch (MalformedURLException ex) {
-                ex.printStackTrace();
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            } finally {
-                if (connection != null) {
-                    try {
-                        connection.disconnect();
-                    } catch (Exception ex) {
-                        ex.printStackTrace();
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(String output) {
-
-            if (output != null) {
-
-                Log.i("output---", output);
-
-                try {
-                    JSONObject mainObject = new JSONObject(output);
-                    JSONObject flavoursObject = mainObject.getJSONObject("flavors");
-                    JSONObject githubObject = flavoursObject.getJSONObject("github");
-                    JSONObject githubStableObject = githubObject.getJSONObject("stable");
-
-                    String version = githubStableObject.getString("version");
-                    // String versionCode = githubStableObject.getString("version_code");
-                    String apkLocationUrl = githubStableObject.getString("apk");
-
-                    Log.i("jsonConvert---", version + "     " + apkLocationUrl);
-                } catch (JSONException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-    }
-
-
 }

From f85e19c75defdabdc391cd792d73c6d14ef65852 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 15:01:50 +0530
Subject: [PATCH 03/29] Added notification channel and code to show
 notification.

---
 app/src/main/java/org/schabi/newpipe/App.java | 23 ++++++++++++
 .../schabi/newpipe/FetchAppVersionTask.java   | 37 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  8 ++++
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index f436a26b8..77c6b6cb0 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -63,6 +63,7 @@ import io.reactivex.plugins.RxJavaPlugins;
 public class App extends Application {
     protected static final String TAG = App.class.toString();
     private RefWatcher refWatcher;
+    private static App context;
 
     @SuppressWarnings("unchecked")
     private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
@@ -85,6 +86,8 @@ public class App extends Application {
         }
         refWatcher = installLeakCanary();
 
+        context = this;
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
@@ -202,6 +205,22 @@ public class App extends Application {
 
         NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
+
+        // Set up notification channel for app update
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
     }
 
     @Nullable
@@ -217,4 +236,8 @@ public class App extends Application {
     protected boolean isDisposedRxExceptionsReported() {
         return false;
     }
+
+    public static App getContext() {
+        return context;
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
index 2f98fe1ad..75da96096 100644
--- a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
@@ -1,7 +1,12 @@
 package org.schabi.newpipe;
 
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.AsyncTask;
-import android.util.Log;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -88,8 +93,6 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
 
         if (output != null) {
 
-            Log.i("output---", output);
-
             try {
                 JSONObject mainObject = new JSONObject(output);
                 JSONObject flavoursObject = mainObject.getJSONObject("flavors");
@@ -108,11 +111,37 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
         }
     }
 
+    /**
+     * Method to compare
+     * @param versionName
+     * @param apkLocationUrl
+     */
     private void compareAppVersionAndShowNotification(String versionName, String apkLocationUrl) {
 
-        if (!BuildConfig.VERSION_NAME.equals(versionName)) {
+        int NOTIFICATION_ID = 2000;
 
+        if (!BuildConfig.VERSION_NAME.equals(versionName.replace("v", ""))) {
 
+            Application app = App.getContext();
+
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            PendingIntent pendingIntent
+                    = PendingIntent.getActivity(app, 0, intent, 0);
+
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat
+                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
+                    .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+                    .setContentText(app.getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
+
+            // notificationId is a unique int for each notification that you must define
+            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
         }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ee80536f..6ad772494 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,6 +144,10 @@
     <string name="notification_channel_name">NewPipe Notification</string>
     <string name="notification_channel_description">Notifications for NewPipe Background and Popup Players</string>
 
+    <string name="app_update_notification_channel_id" translatable="false">newpipeAppUpdate</string>
+    <string name="app_update_notification_channel_name">App Update Notification</string>
+    <string name="app_update_notification_channel_description">Notifications for new NewPipe version</string>
+
     <string name="unknown_content">[Unknown]</string>
 
     <string name="toggle_orientation">Toggle Orientation</string>
@@ -504,4 +508,8 @@
         <item>144p</item>
     </string-array>
 
+    <!-- App update notification -->
+    <string name="app_update_notification_content_title">NewPipe Update Available</string>
+    <string name="app_update_notification_content_text">Tap to download</string>
+
 </resources>

From 06f20c66f8fc3f66cd255f13d5f9ab1e9b1ec384 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 16:35:53 +0530
Subject: [PATCH 04/29] Moved the new version check to the application class.

---
 app/src/main/java/org/schabi/newpipe/App.java                | 5 +++++
 .../main/java/org/schabi/newpipe/FetchAppVersionTask.java    | 1 +
 app/src/main/java/org/schabi/newpipe/MainActivity.java       | 4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 77c6b6cb0..0a218d061 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -99,6 +99,11 @@ public class App extends Application {
         ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        if (BuildConfig.FLAVOR.equals("github")) {
+            new FetchAppVersionTask().execute();
+        }
     }
 
     protected Downloader getDownloader() {
diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
index 75da96096..d56e07127 100644
--- a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
@@ -124,6 +124,7 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
 
             Application app = App.getContext();
 
+            // A pending intent to open the apk location url in the browser.
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
             PendingIntent pendingIntent
                     = PendingIntent.getActivity(app, 0, intent, 0);
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 1554dddc0..0ce6772bb 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -80,10 +80,6 @@ public class MainActivity extends AppCompatActivity {
 
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
-        if (BuildConfig.FLAVOR.equals("github")) {
-            new FetchAppVersionTask().execute();
-        }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 

From 930c971035f425e3d692f0c1debb295513aa4b15 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 16:41:21 +0530
Subject: [PATCH 05/29] Added version check in the pop-up player

---
 .../java/org/schabi/newpipe/player/PopupVideoPlayer.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index 8107345a1..a4c91cd30 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -58,6 +58,7 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;
 
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.FetchAppVersionTask;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -663,6 +664,11 @@ public final class PopupVideoPlayer extends Service {
             lockManager.acquireWifiAndCpu();
 
             hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+
+            // Check for new version
+            if (BuildConfig.FLAVOR.equals("github")) {
+                new FetchAppVersionTask().execute();
+            }
         }
 
         @Override

From 12b93d66377b57e4bbfc7a1cd1556a7f21ab676f Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 17:18:46 +0530
Subject: [PATCH 06/29] Added new icon for update notification.

---
 .../org/schabi/newpipe/FetchAppVersionTask.java  |   2 +-
 .../main/res/drawable-hdpi/ic_newpipe_update.png | Bin 0 -> 680 bytes
 .../main/res/drawable-mdpi/ic_newpipe_update.png | Bin 0 -> 401 bytes
 .../res/drawable-xhdpi/ic_newpipe_update.png     | Bin 0 -> 734 bytes
 .../res/drawable-xxhdpi/ic_newpipe_update.png    | Bin 0 -> 1370 bytes
 .../res/drawable-xxxhdpi/ic_newpipe_update.png   | Bin 0 -> 2177 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100755 app/src/main/res/drawable-hdpi/ic_newpipe_update.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_newpipe_update.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_newpipe_update.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_newpipe_update.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_newpipe_update.png

diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
index d56e07127..3130dc655 100644
--- a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
@@ -131,7 +131,7 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
 
             NotificationCompat.Builder notificationBuilder = new NotificationCompat
                     .Builder(app, app.getString(R.string.app_update_notification_channel_id))
-                    .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
                     .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                     .setContentIntent(pendingIntent)
                     .setAutoCancel(true)
diff --git a/app/src/main/res/drawable-hdpi/ic_newpipe_update.png b/app/src/main/res/drawable-hdpi/ic_newpipe_update.png
new file mode 100755
index 0000000000000000000000000000000000000000..cbf336a1f173c751889af7f1a0164edb045c82d9
GIT binary patch
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007SNkl<ZScT2l
zIcQW-6vpuvqj8N|C56ESL~vI~un+`6P!SYGP(eFUA&pz%2By+R5v=S|icLfiJ8=UM
z7hKW^g8PO<F*Zqz&d=h$z~eddW+s_Q=7ZO~Ip^@d_uO;Oc@ssoER4fM)QvSu6h%>l
zsW^<?7&q2D5gO5n9ByDS>T3lkhj-|}{4v?F6wr|V;0X?)u@-=mx`#!z1O)v!j};hS
z3qUZ4r#Mp8G?oD*w&_DRHmXK7W&m~LR|aT5E~@l3kpZ+0d+|W1x<Y!3lW3_n&|0Cb
z%)&wZ%zzreGi<9WP|B_um(iQYHmRFff`+OB#kLLDfi9uy3W0sW8O*IJP{OAP?RcF5
zHHiB-rkq1R9H5l{odQ5f-NU?50g7X6!268d8qxtws45U<<5CfzL0rRD#SZ&$fiNCN
z@fCkFV0y71Q%YH2*+9aCxdzwcl^0VEAF!*UK&Zn?T!>d)u6nSkB0w?BX}pr%MvCbT
z=2QZxBhT;o)P;rd(=IgNqy}-k5<q85+=0%7&lX`+Nh*h{m{}`8gxh;TrGWklGt!Hc
z?JaD^(u7YF)(ffomau)2v>OS~kJzqNxN(#Eg;SWGirt2XDcifU+DM5&+ptrddo086
zlzk6QBz#s0Gg4AHVT74FQlR>j&lKGDzXpVgTqvX_9diKt3c?fs$_Y7d&G4zicKN5s
zKlq&IJv_pUa)A1TmQb__Vg}C1UrG7&9LqCdQb6Ca2Q!uU*9@i!hdHaK<%EO0vXqz+
zCJW`+T#`fn7;U(Mm-vWJLYsIjd{`E~2&*O3qeZB$)x!7Mq)`W{g#G~=P}v~1B^9y&
O0000<MNUMnLSTX?;x%so

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_newpipe_update.png b/app/src/main/res/drawable-mdpi/ic_newpipe_update.png
new file mode 100755
index 0000000000000000000000000000000000000000..8ab23eb6a23bf39eee7d9dff104f9968e6924843
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00044Nkl<ZNQu4F
zAx~UE6o%m~!L)=ntROfDX+xTTB0&&pF-Qo6AgY>*Ius2C3<`nbKafxXrl|oO9tSv}
zRSlvv0UFo`v9rnaa%Z!5+2wO{&NufxbLO5Ym7YuJ##B22y{KRZZ`%ogJFMYNy8ty^
zVj3^n1*qu=?^_MH&p;~JL{F;#^EghNY6hK81q_GyXZ*>5Tw<u<`$+*pt^<1^pFPnQ
zUOfqr@tr5ywp6!mjRJyqOm$ZBls}{e0S5`dcXTxkz$g4owCENKO|=Mv_?c))tUJsV
z0$@GS4)}suoJ6tHqJVF8D((-S!zfn4yJi6YqTB_Rh1V7zu^r_nivYI6$I6-NSE9Y+
zs*_#QND)9e^6Y0IU-1FIqu4Kb&qoGuhQ1unYt`Q|)=g%;SnrarLsj|1QuR&X%46MQ
vHMOsVml#MI{`ZzcA-nj24U9Ijx8-^OWa0KzoC)*<00000NkvXXu0mjf>`toA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_newpipe_update.png b/app/src/main/res/drawable-xhdpi/ic_newpipe_update.png
new file mode 100755
index 0000000000000000000000000000000000000000..5ee02aaa9359524b5a83988ddd54724dbef58854
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007|Nkl<ZXo2n7
zO^8il9LMoH-lCb(5G5muk|->dQcBIjU}J@%q+}^2AyQI|5*sTkQfd~Ig^j#rDP(~(
zE0nj!TbIFnEY7_;-R?Pao_o)|=T7-9PtWsze&5@3&-tI{luG~UKrjp4MdxT3tidq0
zVRF%Vf~g3MiMWsD=qfr_W@-fBH_l;B(b+OlN1#d>n=rlTjH#puRC$NRMdwT;gFuy=
zMQ5!`fWR1jVkagQo%<gF0&$UHtSvfwsZ?r6AkHn!o5%w28H1QIQ3a~J!j4W8I3;>I
zXXO{}VOggL?7|dm#m4}V@3?@T!UbaEdT<)w0z}?mH>MUY5F6iz8yL+fF@`6Vb@Fc#
zLj_{<HsVo6i7JEW>j;6^{1f;TAn^y=<<%rMD^RJ?jUiDho|Tta(-8u(TB}8EM#ytz
zNHgyqc?wkObzvWV1W5eGevLfM^A?EJosMe(5-@@lg$rO3F3EnYRT(=Vv{lbrKy-T@
z2?!2nHF~s@mjG7cMM|wCUSml^;qwp>9gJNS_NT4o3%0aXK(x;f;X}&&5Wb_oEduD*
z*mfC@x0ul~0rcXss2yk(7h5T?E@f;Yb=JI{GW@-euC)UNVBJI)xX^BaRH+68?zBsw
zjEka|`C5)-SbHWO*O~jU)dGJ+ZS%s)^>+#L52mc!jb{n-uC!9%3kGVg-%FSeC+n;^
z4bM~NWItaD6zEN;aV#YaoT?c=oHDkoRkzWU8ncc6I(affc(|K6d|m>TI%mcSM${^#
zF^WZb2#n&mfRi=RpYmx2i8PJ|g-;N;j-|ncqFVEfzeSQ5Y-G*2z%Vvw^7IUID?dV3
z%GlG)f~&Asj$i9V?+TmoASL)$oEN(1+YJ_oPPY%>u;|ETy-xpp`=2`e1=-pLm1y2b
QXaE2J07*qoM6N<$f|apLeE<Le

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_newpipe_update.png b/app/src/main/res/drawable-xxhdpi/ic_newpipe_update.png
new file mode 100755
index 0000000000000000000000000000000000000000..22f0e99d1b780ffb9d42c40b9c6a1a758b4cfb55
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000FcNkl<Zc%1Fq
zTZoip7{Kv7YZ|7xp_!$Lc38`(An2llbx}|VT^M9VK}F$3B?NY$q6{mD!YGTVC<-s4
z0~QHkMM7QJ!Ket)Kq>MjH*Ix2@BF%WW^mYM$C>?(*8E}Eo0<20-v7Sedwjm*j_c5&
zLy=$%Mi(7NX~9)^0Ow#>(eacH+<?9K0ZVXv(J_^Zs-S*H*nmrlj;k~@5CnhXNp%13
zAG<*W!D0N2rI=ZCoQ2Uu5LB=m-{Rt;V=aWE2pY(nI3FX6jypHn6a-svKh7>X_FNc(
zAlM^jyIU}>=r&}^5CzpZfKM^0=yqgALP0flh{x_M3@^G(sgjZ)Vp*^OcVTkT?MjUl
z1rf`FKKz8s{1<vt%7W@e_23ztf)PcxbI4>QsGiy;__U(iIwW!sL@WzF!y?DpA~PpJ
zH4furoL+RhTc!;`AK)D^rB@P2>c=KLgc-_yTF{1|r!fh)V|@ZaH4bAf7URUCJq$`a
zf~wyifs=5bI5$etn=0tVyXY?3MMK&ZG~l=M@gDvXJt7G`ctkvQql$3RkR*btzn_3x
zu?G7SN;-tkafh;Of|ClWD`zV16sM3$s9=}a1Yc9QsI&ytl{Z?9DM=qWIEdvKo3)2#
z4N6r|wak%NAjYR&$p&)Rh`TXO-ut^O1l5&21viVwB`N#GB6D#T9-1{GGeOnzhl}y)
zVX-VoLcbWFR%5n27MWQKs;g%h=He@{EJ*s;{UJ8NQ!^Enm!P`(Cg7&3sHBqm99fNL
zGu!1YsIJ~Kunb!hN`jqYpEy6w7;AwRBB-wZ8F*h@P$unBaIe@3rSsSoEvOnpm&gT3
zLr_27Kv!D972SiTSLOVef}jI<Nt}m|Nh`pj#-MRxaQzPZ63RIwZd4XxyfkOEyai#b
zxIcS4fsh*g*p3%vb=8!YAaRb=jg?~NO5>RKpjchcP0L54z%v&ly8RM-Bb`m`KuPOy
zMVemfgU@m=Hbxw(txH)-BevnvV?vPF&CkQL;-oN*>AMxS;KEW1!enuyx>0ohyxD{~
zr4u9$%C5urVw}mV*EHfSWmyM_$7v2$iG^Aj_#F$%B50Oa?4>z7t;VAbK5JY2eMKxM
zk|)JWE~s1Fwx-F#LF&4vjWV`kdPh)muI~tH&MO^3&Dqcq)SMk<7gP~98O_Q+fX!lI
zS^Hc*NL@D$_};IY&z}3sDyWvVu@={g_t6Gpm&g^G&}Q6IutJ<A4aV-W3feBR@TXS4
z^V?C%?!{wm#{HZ~?Q6!CG6|}P`>s`(G2lC2v`{{g{?asu5u-%UX@xaq5wr~-i6qT`
z<@VsI78}%u2QhJwy1Lqs153*ws0&x(<R*1ot@$`qPY<4GP{w%iSoOA8PA}#aE~v#i
zW{a2dTIB$i4Jc!U_Kr_Jk;Y3lISHzb8}07)mt&^rIqk4VWW6O%m66|}{e1k=W<z(1
z0lwK(-iY<m%EfkcK^5^IS(LDzVPfjfgN1Uqdah5=y(p~;@q*;Zo`bOukEao5eZY+b
z?ZuZO?Jd=`5=_LaTA$TgrB{qq>89v45VTn&iO-TzVv<ODdOk%te~S~x^j{6F6I8*6
zI8_dB<cLH5+r(Zh2|Z%W$tL-{TKKx^-`rnS5@~s_iJsf)*tAc~h$}HI>j0;zZYqnS
z+M6yAW8UldTI3+^6`31-V#B*0FN+syx-;uFWkoCnCW@@HGjT4?6SuT;MJ~|^MaS8p
cLx-062ZvJ(o>WhTC;$Ke07*qoM6N<$f`%81KmY&$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_newpipe_update.png b/app/src/main/res/drawable-xxxhdpi/ic_newpipe_update.png
new file mode 100755
index 0000000000000000000000000000000000000000..1f44c1aaf28c6773c1125ab7c6a0692c7c76b81c
GIT binary patch
literal 2177
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
DUcmjm

literal 0
HcmV?d00001


From af42e32ae6ef75cc1ae143694f79640ddf45e6de Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 18:34:20 +0530
Subject: [PATCH 07/29] Code refactored and added comments.

---
 app/src/main/java/org/schabi/newpipe/App.java |  4 +--
 ...sk.java => CheckForNewAppVersionTask.java} | 34 +++++++++++++------
 .../newpipe/player/PopupVideoPlayer.java      |  6 ++--
 3 files changed, 26 insertions(+), 18 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/{FetchAppVersionTask.java => CheckForNewAppVersionTask.java} (80%)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 0a218d061..fe64d95fb 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -101,9 +101,7 @@ public class App extends Application {
         configureRxJavaErrorHandler();
 
         // Check for new version
-        if (BuildConfig.FLAVOR.equals("github")) {
-            new FetchAppVersionTask().execute();
-        }
+        new CheckForNewAppVersionTask().execute();
     }
 
     protected Downloader getDownloader() {
diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
similarity index 80%
rename from app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
rename to app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 3130dc655..2be4712a7 100644
--- a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -19,20 +19,29 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 /**
- * AsyncTask to check if there is a newer version of the github apk available or not.
+ * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
  * If there is a newer version we show a notification, informing the user. On tapping
- * the notification, the user will be directed to download link.
+ * the notification, the user will be directed to the download link.
  */
-public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
+public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
     private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
     private int timeoutPeriod = 10000;
 
+    @Override
+    protected void onPreExecute() {
+        // Continue with version check only if the build variant is of type "github".
+        if (!BuildConfig.FLAVOR.equals("github")) {
+            this.cancel(true);
+        }
+    }
+
     @Override
     protected String doInBackground(Void... voids) {
 
-        String output;
+        // Make a network request to get latest NewPipe data.
 
+        String response;
         HttpURLConnection connection = null;
 
         try {
@@ -63,13 +72,14 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
                     String line;
 
                     while ((line = bufferedReader.readLine()) != null) {
-                        stringBuilder.append(line + "\n");
+                        stringBuilder.append(line);
+                        stringBuilder.append("\n");
                     }
 
                     bufferedReader.close();
-                    output = stringBuilder.toString();
+                    response = stringBuilder.toString();
 
-                    return output;
+                    return response;
             }
         } catch (MalformedURLException ex) {
             ex.printStackTrace();
@@ -89,12 +99,13 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
     }
 
     @Override
-    protected void onPostExecute(String output) {
+    protected void onPostExecute(String response) {
 
-        if (output != null) {
+        // Parse the json from the response.
+        if (response != null) {
 
             try {
-                JSONObject mainObject = new JSONObject(output);
+                JSONObject mainObject = new JSONObject(response);
                 JSONObject flavoursObject = mainObject.getJSONObject("flavors");
                 JSONObject githubObject = flavoursObject.getJSONObject("github");
                 JSONObject githubStableObject = githubObject.getJSONObject("stable");
@@ -112,7 +123,8 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
     }
 
     /**
-     * Method to compare
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
      * @param versionName
      * @param apkLocationUrl
      */
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index a4c91cd30..2c233f219 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -58,7 +58,7 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;
 
 import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.FetchAppVersionTask;
+import org.schabi.newpipe.CheckForNewAppVersionTask;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -666,9 +666,7 @@ public final class PopupVideoPlayer extends Service {
             hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
 
             // Check for new version
-            if (BuildConfig.FLAVOR.equals("github")) {
-                new FetchAppVersionTask().execute();
-            }
+            new CheckForNewAppVersionTask().execute();
         }
 
         @Override

From 2a18eacf622e71226aa7216183ab1096ff288153 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sun, 12 Aug 2018 20:57:30 +0530
Subject: [PATCH 08/29] More refactoring.

---
 .../org/schabi/newpipe/CheckForNewAppVersionTask.java | 11 ++++-------
 app/src/main/res/values/strings.xml                   |  4 ++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 2be4712a7..134fb3406 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -25,13 +25,15 @@ import java.net.URL;
  */
 public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
+    private Application app = App.getContext();
+
     private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
     private int timeoutPeriod = 10000;
 
     @Override
     protected void onPreExecute() {
         // Continue with version check only if the build variant is of type "github".
-        if (!BuildConfig.FLAVOR.equals("github")) {
+        if (!BuildConfig.FLAVOR.equals(app.getString(R.string.app_flavor_github))) {
             this.cancel(true);
         }
     }
@@ -63,8 +65,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
                 case 200:
                 case 201:
-                    BufferedReader bufferedReader
-                            = new BufferedReader(
+                    BufferedReader bufferedReader = new BufferedReader(
                             new InputStreamReader(connection.getInputStream()));
 
                     StringBuilder stringBuilder = new StringBuilder();
@@ -134,8 +135,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
         if (!BuildConfig.VERSION_NAME.equals(versionName.replace("v", ""))) {
 
-            Application app = App.getContext();
-
             // A pending intent to open the apk location url in the browser.
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
             PendingIntent pendingIntent
@@ -152,8 +151,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
                             + " " + versionName);
 
             NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
-
-            // notificationId is a unique int for each notification that you must define
             notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ad772494..f83324845 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -512,4 +512,8 @@
     <string name="app_update_notification_content_title">NewPipe Update Available</string>
     <string name="app_update_notification_content_text">Tap to download</string>
 
+    <!-- Flavor names -->
+    <string name="app_flavor_github">github</string>
+    <string name="app_flavor_fdroid">fdroid</string>
+
 </resources>

From e7abeb5ad91afb700f0d914ea1906a5c05f18b89 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Fri, 17 Aug 2018 00:53:42 +0530
Subject: [PATCH 09/29] Added version code check.

---
 app/src/main/java/org/schabi/newpipe/App.java | 30 +++++++++++--------
 .../newpipe/CheckForNewAppVersionTask.java    | 10 ++++---
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index fe64d95fb..a9002fda2 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -209,21 +209,25 @@ public class App extends Application {
         NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
 
-        // Set up notification channel for app update
-        final String appUpdateId
-                = getString(R.string.app_update_notification_channel_id);
-        final CharSequence appUpdateName
-                = getString(R.string.app_update_notification_channel_name);
-        final String appUpdateDescription
-                = getString(R.string.app_update_notification_channel_description);
+        // Set up notification channel for app update only if it's a github apk.
 
-        NotificationChannel appUpdateChannel
-                = new NotificationChannel(appUpdateId, appUpdateName, importance);
-        appUpdateChannel.setDescription(appUpdateDescription);
+        if (!BuildConfig.FLAVOR.equals(getString(R.string.app_flavor_github))) {
 
-        NotificationManager appUpdateNotificationManager
-                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
+            final String appUpdateId
+                    = getString(R.string.app_update_notification_channel_id);
+            final CharSequence appUpdateName
+                    = getString(R.string.app_update_notification_channel_name);
+            final String appUpdateDescription
+                    = getString(R.string.app_update_notification_channel_description);
+
+            NotificationChannel appUpdateChannel
+                    = new NotificationChannel(appUpdateId, appUpdateName, importance);
+            appUpdateChannel.setDescription(appUpdateDescription);
+
+            NotificationManager appUpdateNotificationManager
+                    = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
+        }
     }
 
     @Nullable
diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 134fb3406..b6b269bb5 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -112,10 +112,10 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
                 JSONObject githubStableObject = githubObject.getJSONObject("stable");
 
                 String versionName = githubStableObject.getString("version");
-                // String versionCode = githubStableObject.getString("version_code");
+                String versionCode = githubStableObject.getString("version_code");
                 String apkLocationUrl = githubStableObject.getString("apk");
 
-                compareAppVersionAndShowNotification(versionName, apkLocationUrl);
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
 
             } catch (JSONException ex) {
                 ex.printStackTrace();
@@ -129,11 +129,13 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
      * @param versionName
      * @param apkLocationUrl
      */
-    private void compareAppVersionAndShowNotification(String versionName, String apkLocationUrl) {
+    private void compareAppVersionAndShowNotification(String versionName,
+                                                      String apkLocationUrl,
+                                                      String versionCode) {
 
         int NOTIFICATION_ID = 2000;
 
-        if (!BuildConfig.VERSION_NAME.equals(versionName.replace("v", ""))) {
+        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
 
             // A pending intent to open the apk location url in the browser.
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));

From 04e974b3264db7001bd03511bdfa32a326ef12d0 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Fri, 17 Aug 2018 01:11:51 +0530
Subject: [PATCH 10/29] Bug fix.

---
 app/src/main/java/org/schabi/newpipe/App.java                | 3 +--
 .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java   | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index a9002fda2..c9ebc976c 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -210,8 +210,7 @@ public class App extends Application {
         mNotificationManager.createNotificationChannel(mChannel);
 
         // Set up notification channel for app update only if it's a github apk.
-
-        if (!BuildConfig.FLAVOR.equals(getString(R.string.app_flavor_github))) {
+        if (BuildConfig.FLAVOR.equals(getString(R.string.app_flavor_github))) {
 
             final String appUpdateId
                     = getString(R.string.app_update_notification_channel_id);
diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index b6b269bb5..b53ef1794 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -34,7 +35,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     protected void onPreExecute() {
         // Continue with version check only if the build variant is of type "github".
         if (!BuildConfig.FLAVOR.equals(app.getString(R.string.app_flavor_github))) {
-            this.cancel(true);
+            // this.cancel(true);
         }
     }
 
@@ -102,6 +103,8 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     @Override
     protected void onPostExecute(String response) {
 
+        Log.i("Response--", response);
+
         // Parse the json from the response.
         if (response != null) {
 

From 910c10f55428305b671b609a219a7f746ef32757 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Fri, 17 Aug 2018 01:46:33 +0530
Subject: [PATCH 11/29] Removed debug code

---
 .../main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index b53ef1794..5794b0d0f 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -35,7 +35,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     protected void onPreExecute() {
         // Continue with version check only if the build variant is of type "github".
         if (!BuildConfig.FLAVOR.equals(app.getString(R.string.app_flavor_github))) {
-            // this.cancel(true);
+            this.cancel(true);
         }
     }
 

From 17197ad670e96feea6c45b0d7d62f9de56d94032 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sat, 15 Sep 2018 12:51:39 +0530
Subject: [PATCH 12/29] Pull request changes begins here.

---
 .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java    | 4 ++--
 .../main/java/org/schabi/newpipe/player/PopupVideoPlayer.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 5794b0d0f..628704b23 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -44,6 +44,8 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
         // Make a network request to get latest NewPipe data.
 
+        Log.i("Update---", "checking");
+
         String response;
         HttpURLConnection connection = null;
 
@@ -103,8 +105,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     @Override
     protected void onPostExecute(String response) {
 
-        Log.i("Response--", response);
-
         // Parse the json from the response.
         if (response != null) {
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index 2c233f219..f9892ecb5 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -666,7 +666,7 @@ public final class PopupVideoPlayer extends Service {
             hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
 
             // Check for new version
-            new CheckForNewAppVersionTask().execute();
+            //new CheckForNewAppVersionTask().execute();
         }
 
         @Override

From 6417bd91ef339e246f2413ae791367bb2b21fd1c Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sat, 15 Sep 2018 14:08:32 +0530
Subject: [PATCH 13/29] Pull request changes v1.

---
 .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 628704b23..4b75c202c 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -7,7 +7,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
-import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -16,7 +15,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 /**
@@ -44,8 +42,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
         // Make a network request to get latest NewPipe data.
 
-        Log.i("Update---", "checking");
-
         String response;
         HttpURLConnection connection = null;
 
@@ -85,8 +81,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
                     return response;
             }
-        } catch (MalformedURLException ex) {
-            ex.printStackTrace();
         } catch (IOException ex) {
             ex.printStackTrace();
         } finally {

From 7124d9bca50ab5fbc7965d069f9f41edf3dc73ea Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <kartikey92@gmail.com>
Date: Sat, 15 Sep 2018 20:51:17 +0530
Subject: [PATCH 14/29] Removed flvor checks. Added update settings under main
 settings.

---
 app/build.gradle                              | 14 --------
 app/src/main/java/org/schabi/newpipe/App.java | 29 +++++++--------
 .../newpipe/CheckForNewAppVersionTask.java    | 18 ++++++++--
 .../settings/UpdateSettingsFragment.java      | 35 +++++++++++++++++++
 .../res/drawable/ic_settings_update_black.xml |  9 +++++
 .../res/drawable/ic_settings_update_white.xml |  5 +++
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/settings_keys.xml     |  3 ++
 app/src/main/res/values/strings.xml           |  9 ++---
 app/src/main/res/values/styles.xml            |  2 ++
 app/src/main/res/xml/main_settings.xml        |  5 +++
 app/src/main/res/xml/update_settings.xml      | 13 +++++++
 12 files changed, 107 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
 create mode 100644 app/src/main/res/drawable/ic_settings_update_black.xml
 create mode 100644 app/src/main/res/drawable/ic_settings_update_white.xml
 create mode 100644 app/src/main/res/xml/update_settings.xml

diff --git a/app/build.gradle b/app/build.gradle
index b5a106a6d..2fd175fbe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,20 +41,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    flavorDimensions "apkSource"
-    productFlavors {
-        github {
-            dimension "apkSource"
-            applicationIdSuffix ".github"
-
-        }
-
-        fdroid {
-            dimension "apkSource"
-            applicationIdSuffix ".fdroid"
-        }
-    }
 }
 
 ext {
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index c9ebc976c..bc824699e 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -209,24 +209,21 @@ public class App extends Application {
         NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
 
-        // Set up notification channel for app update only if it's a github apk.
-        if (BuildConfig.FLAVOR.equals(getString(R.string.app_flavor_github))) {
+        // Set up notification channel for app update.
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
 
-            final String appUpdateId
-                    = getString(R.string.app_update_notification_channel_id);
-            final CharSequence appUpdateName
-                    = getString(R.string.app_update_notification_channel_name);
-            final String appUpdateDescription
-                    = getString(R.string.app_update_notification_channel_description);
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
 
-            NotificationChannel appUpdateChannel
-                    = new NotificationChannel(appUpdateId, appUpdateName, importance);
-            appUpdateChannel.setDescription(appUpdateDescription);
-
-            NotificationManager appUpdateNotificationManager
-                    = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-            appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
-        }
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
     }
 
     @Nullable
diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 4b75c202c..9694850d7 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -3,10 +3,13 @@ package org.schabi.newpipe;
 import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,12 +32,23 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
     private int timeoutPeriod = 10000;
 
+    private SharedPreferences mPrefs;
+
     @Override
     protected void onPreExecute() {
-        // Continue with version check only if the build variant is of type "github".
-        if (!BuildConfig.FLAVOR.equals(app.getString(R.string.app_flavor_github))) {
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        // Check if user has enabled/ disabled update checking.
+        if (mPrefs.getBoolean(app.getString(R.string.update_app_key), true)) {
+
+            // Go ahead with further checks.
+            Log.i("pref---", "true");
+        } else {
+            Log.i("pref---", "false");
             this.cancel(true);
         }
+
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
new file mode 100644
index 000000000..f6aab7cda
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -0,0 +1,35 @@
+package org.schabi.newpipe.settings;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.Preference;
+
+import org.schabi.newpipe.R;
+
+public class UpdateSettingsFragment extends BasePreferenceFragment {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String updateToggleKey = getString(R.string.update_app_key);
+        findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.update_settings);
+    }
+
+    private Preference.OnPreferenceChangeListener updatePreferenceChange
+            = new Preference.OnPreferenceChangeListener() {
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+
+            defaultPreferences.edit().putBoolean(getString(R.string.update_app_key),
+                    (boolean) newValue).apply();
+
+            return true;
+        }
+    };
+}
diff --git a/app/src/main/res/drawable/ic_settings_update_black.xml b/app/src/main/res/drawable/ic_settings_update_black.xml
new file mode 100644
index 000000000..261c31217
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_update_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_update_white.xml b/app/src/main/res/drawable/ic_settings_update_white.xml
new file mode 100644
index 000000000..0feb270af
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_update_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7b879fb4c..75c39c490 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -38,6 +38,7 @@
     <attr name="ic_add" format="reference"/>
     <attr name="ic_restore_defaults" format="reference"/>
     <attr name="ic_blank_page" format="reference"/>
+    <attr name="ic_settings_update" format="reference"/>
 
     <!-- Can't refer to colors directly in drawable's xml-->
     <attr name="toolbar_shadow_drawable" format="reference"/>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 9b39fec26..b7ffb101d 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -201,6 +201,9 @@
         <item>@string/always_ask_open_action_key</item>
     </string-array>
 
+    <!-- Updates -->
+    <string name="update_app_key" translatable="false">update_app_key</string>
+
     <!-- alternatively, load these from some local android data store -->
     <string-array name="language_codes" translatable="false">
         <item>af</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab55b6f6c..29fa4dc03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,6 +109,7 @@
     <string name="settings_category_appearance_title">Appearance</string>
     <string name="settings_category_other_title">Other</string>
     <string name="settings_category_debug_title">Debug</string>
+    <string name="settings_category_updates_title">Updates</string>
     <string name="background_player_playing_toast">Playing in background</string>
     <string name="popup_playing_toast">Playing in popup mode</string>
     <string name="background_player_append">Queued on background player</string>
@@ -515,6 +516,10 @@
         <item>144p</item>
     </string-array>
 
+    <!-- Updates Settings -->
+    <string name="updates_setting_title">Updates</string>
+    <string name="updates_setting_description"> Show a notification to prompt app update when a new version is available</string>
+
     <!-- Minimize to exit action -->
     <string name="minimize_on_exit_title">Minimize on application switch</string>
     <string name="minimize_on_exit_summary">Action when switching to other application from main video player — %s</string>
@@ -526,8 +531,4 @@
     <string name="app_update_notification_content_title">NewPipe Update Available</string>
     <string name="app_update_notification_content_text">Tap to download</string>
 
-    <!-- Flavor names -->
-    <string name="app_flavor_github">github</string>
-    <string name="app_flavor_fdroid">fdroid</string>
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 87e19cede..8eae8343d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -54,6 +54,7 @@
         <item name="ic_add">@drawable/ic_add_black_24dp</item>
         <item name="ic_restore_defaults">@drawable/ic_settings_backup_restore_black_24dp</item>
         <item name="ic_blank_page">@drawable/ic_blank_page_black_24dp</item>
+        <item name="ic_settings_update">@drawable/ic_settings_update_black</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -114,6 +115,7 @@
         <item name="ic_add">@drawable/ic_add_white_24dp</item>
         <item name="ic_restore_defaults">@drawable/ic_settings_backup_restore_white_24dp</item>
         <item name="ic_blank_page">@drawable/ic_blank_page_white_24dp</item>
+        <item name="ic_settings_update">@drawable/ic_settings_update_white</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>
diff --git a/app/src/main/res/xml/main_settings.xml b/app/src/main/res/xml/main_settings.xml
index 4196a98d3..3773460d6 100644
--- a/app/src/main/res/xml/main_settings.xml
+++ b/app/src/main/res/xml/main_settings.xml
@@ -29,6 +29,11 @@
         android:icon="?attr/language"
         android:title="@string/content"/>
 
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
+        android:icon="?attr/ic_settings_update"
+        android:title="@string/settings_category_updates_title" />
+
     <PreferenceScreen
         android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"
         android:icon="?attr/bug"
diff --git a/app/src/main/res/xml/update_settings.xml b/app/src/main/res/xml/update_settings.xml
new file mode 100644
index 000000000..59a4d9965
--- /dev/null
+++ b/app/src/main/res/xml/update_settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="general_preferences"
+    android:title="@string/settings_category_updates_title">
+
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="@string/update_app_key"
+        android:title="@string/updates_setting_title"
+        android:summary="@string/updates_setting_description"/>
+
+</PreferenceScreen>

From e2341363d4b35e28181aa09f9f3d2993004b659f Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Sun, 14 Oct 2018 19:16:28 +0530
Subject: [PATCH 15/29] Added check for SHA1 key.

---
 .../newpipe/CheckForNewAppVersionTask.java    | 91 +++++++++++++++++--
 1 file changed, 82 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 9694850d7..fd94980c9 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -4,6 +4,9 @@ import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
@@ -15,10 +18,18 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 
 /**
  * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
@@ -29,6 +40,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
     private Application app = App.getContext();
 
+    private String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
     private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
     private int timeoutPeriod = 10000;
 
@@ -39,23 +51,18 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
 
-        // Check if user has enabled/ disabled update checking.
-        if (mPrefs.getBoolean(app.getString(R.string.update_app_key), true)) {
-
-            // Go ahead with further checks.
-            Log.i("pref---", "true");
-        } else {
-            Log.i("pref---", "false");
+        // Check if user has enabled/ disabled update checking
+        // and if the current apk is a github one or not.
+        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
+                || !getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1)) {
             this.cancel(true);
         }
-
     }
 
     @Override
     protected String doInBackground(Void... voids) {
 
         // Make a network request to get latest NewPipe data.
-
         String response;
         HttpURLConnection connection = null;
 
@@ -167,4 +174,70 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
             notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
         }
     }
+
+    /**
+     * Method to get the apk's SHA1 key.
+     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
+     */
+    private String getCertificateSHA1Fingerprint() {
+
+        PackageManager pm = app.getPackageManager();
+        String packageName = app.getPackageName();
+        int flags = PackageManager.GET_SIGNATURES;
+        PackageInfo packageInfo = null;
+
+        try {
+            packageInfo = pm.getPackageInfo(packageName, flags);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        Signature[] signatures = packageInfo.signatures;
+        byte[] cert = signatures[0].toByteArray();
+        InputStream input = new ByteArrayInputStream(cert);
+        CertificateFactory cf = null;
+
+        try {
+            cf = CertificateFactory.getInstance("X509");
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
+
+        X509Certificate c = null;
+
+        try {
+            c = (X509Certificate) cf.generateCertificate(input);
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
+
+        String hexString = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(c.getEncoded());
+            hexString = byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException e1) {
+            e1.printStackTrace();
+        } catch (CertificateEncodingException e) {
+            e.printStackTrace();
+        }
+
+        return hexString;
+    }
+
+    private static String byte2HexFormatted(byte[] arr) {
+
+        StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            int l = h.length();
+            if (l == 1) h = "0" + h;
+            if (l > 2) h = h.substring(l - 2, l);
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) str.append(':');
+        }
+        return str.toString();
+    }
 }

From 8ef702fa075529feee099e3f496ea8aea4f67520 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Thu, 18 Oct 2018 22:59:33 +0530
Subject: [PATCH 16/29] Removed updates options from settings in case of non
 github apk.

---
 .../gen/org/schabi/newpipe/BuildConfig.java    |  8 ++++++++
 .../debug/gen/org/schabi/newpipe/Manifest.java |  7 +++++++
 app/src/debug/gen/org/schabi/newpipe/R.java    |  7 +++++++
 .../gen/org/schabi/newpipe/BuildConfig.java    |  8 ++++++++
 .../main/gen/org/schabi/newpipe/Manifest.java  |  7 +++++++
 app/src/main/gen/org/schabi/newpipe/R.java     |  7 +++++++
 .../newpipe/CheckForNewAppVersionTask.java     | 18 +++++++++++-------
 .../newpipe/settings/MainSettingsFragment.java |  8 ++++++++
 .../settings/UpdateSettingsFragment.java       |  1 +
 app/src/main/res/values/settings_keys.xml      |  1 +
 app/src/main/res/values/strings.xml            |  2 +-
 app/src/main/res/xml/main_settings.xml         |  3 ++-
 12 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 app/src/debug/gen/org/schabi/newpipe/BuildConfig.java
 create mode 100644 app/src/debug/gen/org/schabi/newpipe/Manifest.java
 create mode 100644 app/src/debug/gen/org/schabi/newpipe/R.java
 create mode 100644 app/src/main/gen/org/schabi/newpipe/BuildConfig.java
 create mode 100644 app/src/main/gen/org/schabi/newpipe/Manifest.java
 create mode 100644 app/src/main/gen/org/schabi/newpipe/R.java

diff --git a/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java b/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java
new file mode 100644
index 000000000..575afb9cb
--- /dev/null
+++ b/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java
@@ -0,0 +1,8 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
+public final class BuildConfig {
+  public final static boolean DEBUG = Boolean.parseBoolean(null);
+}
\ No newline at end of file
diff --git a/app/src/debug/gen/org/schabi/newpipe/Manifest.java b/app/src/debug/gen/org/schabi/newpipe/Manifest.java
new file mode 100644
index 000000000..10e45a45a
--- /dev/null
+++ b/app/src/debug/gen/org/schabi/newpipe/Manifest.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
+public final class Manifest {
+}
\ No newline at end of file
diff --git a/app/src/debug/gen/org/schabi/newpipe/R.java b/app/src/debug/gen/org/schabi/newpipe/R.java
new file mode 100644
index 000000000..088bdfb0d
--- /dev/null
+++ b/app/src/debug/gen/org/schabi/newpipe/R.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
+public final class R {
+}
\ No newline at end of file
diff --git a/app/src/main/gen/org/schabi/newpipe/BuildConfig.java b/app/src/main/gen/org/schabi/newpipe/BuildConfig.java
new file mode 100644
index 000000000..575afb9cb
--- /dev/null
+++ b/app/src/main/gen/org/schabi/newpipe/BuildConfig.java
@@ -0,0 +1,8 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
+public final class BuildConfig {
+  public final static boolean DEBUG = Boolean.parseBoolean(null);
+}
\ No newline at end of file
diff --git a/app/src/main/gen/org/schabi/newpipe/Manifest.java b/app/src/main/gen/org/schabi/newpipe/Manifest.java
new file mode 100644
index 000000000..10e45a45a
--- /dev/null
+++ b/app/src/main/gen/org/schabi/newpipe/Manifest.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
+public final class Manifest {
+}
\ No newline at end of file
diff --git a/app/src/main/gen/org/schabi/newpipe/R.java b/app/src/main/gen/org/schabi/newpipe/R.java
new file mode 100644
index 000000000..088bdfb0d
--- /dev/null
+++ b/app/src/main/gen/org/schabi/newpipe/R.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package org.schabi.newpipe;
+
+/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
+public final class R {
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index fd94980c9..9ab0f5d36 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -38,11 +38,10 @@ import java.security.cert.X509Certificate;
  */
 public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
-    private Application app = App.getContext();
-
-    private String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
-    private String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
-    private int timeoutPeriod = 10000;
+    private static final Application app = App.getContext();
+    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private static final int timeoutPeriod = 10000;
 
     private SharedPreferences mPrefs;
 
@@ -54,7 +53,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
         // Check if user has enabled/ disabled update checking
         // and if the current apk is a github one or not.
         if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
-                || !getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1)) {
+                || !isGithubApk()) {
             this.cancel(true);
         }
     }
@@ -179,7 +178,7 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
      * Method to get the apk's SHA1 key.
      * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
      */
-    private String getCertificateSHA1Fingerprint() {
+    private static String getCertificateSHA1Fingerprint() {
 
         PackageManager pm = app.getPackageManager();
         String packageName = app.getPackageName();
@@ -240,4 +239,9 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
         }
         return str.toString();
     }
+
+    public static boolean isGithubApk() {
+
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
index 5e07e2b12..43270926e 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.v7.preference.Preference;
 
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.CheckForNewAppVersionTask;
 import org.schabi.newpipe.R;
 
 public class MainSettingsFragment extends BasePreferenceFragment {
@@ -13,6 +14,13 @@ public class MainSettingsFragment extends BasePreferenceFragment {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.main_settings);
 
+        if (!CheckForNewAppVersionTask.isGithubApk()) {
+            final Preference update = findPreference(getString(R.string.update_pref_screen_key));
+            getPreferenceScreen().removePreference(update);
+
+            defaultPreferences.edit().putBoolean(getString(R.string.update_app_key), false).apply();
+        }
+
         if (!DEBUG) {
             final Preference debug = findPreference(getString(R.string.debug_pref_screen_key));
             getPreferenceScreen().removePreference(debug);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index f6aab7cda..157f52a0e 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.preference.Preference;
 
+import org.schabi.newpipe.CheckForNewAppVersionTask;
 import org.schabi.newpipe.R;
 
 public class UpdateSettingsFragment extends BasePreferenceFragment {
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index e282a3bf5..9c6ae92b0 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -205,6 +205,7 @@
 
     <!-- Updates -->
     <string name="update_app_key" translatable="false">update_app_key</string>
+    <string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
 
     <!-- alternatively, load these from some local android data store -->
     <string-array name="language_codes" translatable="false">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8c7932a7..f7e461829 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -529,7 +529,7 @@
     <string name="switch_view">Switch View</string>
 
     <!-- App update notification -->
-    <string name="app_update_notification_content_title">NewPipe Update Available</string>
+    <string name="app_update_notification_content_title">NewPipe Update Available!</string>
     <string name="app_update_notification_content_text">Tap to download</string>
 
 </resources>
diff --git a/app/src/main/res/xml/main_settings.xml b/app/src/main/res/xml/main_settings.xml
index 3773460d6..74450f77b 100644
--- a/app/src/main/res/xml/main_settings.xml
+++ b/app/src/main/res/xml/main_settings.xml
@@ -32,7 +32,8 @@
     <PreferenceScreen
         android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
         android:icon="?attr/ic_settings_update"
-        android:title="@string/settings_category_updates_title" />
+        android:title="@string/settings_category_updates_title"
+        android:key="update_pref_screen_key"/>
 
     <PreferenceScreen
         android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"

From 506ffb988525342ed0bf2fcf8f276ba0fd56f95d Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:02:19 +0530
Subject: [PATCH 17/29] Delete BuildConfig.java

---
 app/src/debug/gen/org/schabi/newpipe/BuildConfig.java | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 app/src/debug/gen/org/schabi/newpipe/BuildConfig.java

diff --git a/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java b/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java
deleted file mode 100644
index 575afb9cb..000000000
--- a/app/src/debug/gen/org/schabi/newpipe/BuildConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file

From 2d5bc3ada85d2fb0151bfe32b6a6fef9d08c0df8 Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:02:30 +0530
Subject: [PATCH 18/29] Delete Manifest.java

---
 app/src/debug/gen/org/schabi/newpipe/Manifest.java | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/src/debug/gen/org/schabi/newpipe/Manifest.java

diff --git a/app/src/debug/gen/org/schabi/newpipe/Manifest.java b/app/src/debug/gen/org/schabi/newpipe/Manifest.java
deleted file mode 100644
index 10e45a45a..000000000
--- a/app/src/debug/gen/org/schabi/newpipe/Manifest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
\ No newline at end of file

From d1a9033525250071a6263f6c4caf3f55ebb285cc Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:02:38 +0530
Subject: [PATCH 19/29] Delete R.java

---
 app/src/debug/gen/org/schabi/newpipe/R.java | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/src/debug/gen/org/schabi/newpipe/R.java

diff --git a/app/src/debug/gen/org/schabi/newpipe/R.java b/app/src/debug/gen/org/schabi/newpipe/R.java
deleted file mode 100644
index 088bdfb0d..000000000
--- a/app/src/debug/gen/org/schabi/newpipe/R.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
\ No newline at end of file

From ec28e972bbf756c98fc95cf1080a3be465d68bcb Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:02:59 +0530
Subject: [PATCH 20/29] Delete BuildConfig.java

---
 app/src/main/gen/org/schabi/newpipe/BuildConfig.java | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 app/src/main/gen/org/schabi/newpipe/BuildConfig.java

diff --git a/app/src/main/gen/org/schabi/newpipe/BuildConfig.java b/app/src/main/gen/org/schabi/newpipe/BuildConfig.java
deleted file mode 100644
index 575afb9cb..000000000
--- a/app/src/main/gen/org/schabi/newpipe/BuildConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file

From 6ef25eb861d0dcf9cf659c29e041b7ec2dd7a05a Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:03:21 +0530
Subject: [PATCH 21/29] Delete Manifest.java

---
 app/src/main/gen/org/schabi/newpipe/Manifest.java | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/src/main/gen/org/schabi/newpipe/Manifest.java

diff --git a/app/src/main/gen/org/schabi/newpipe/Manifest.java b/app/src/main/gen/org/schabi/newpipe/Manifest.java
deleted file mode 100644
index 10e45a45a..000000000
--- a/app/src/main/gen/org/schabi/newpipe/Manifest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
\ No newline at end of file

From 3c6d27b5044520d4877eaef028d6a7fe729a021e Mon Sep 17 00:00:00 2001
From: Kartikey Kushwaha <krtkush@users.noreply.github.com>
Date: Thu, 18 Oct 2018 23:04:07 +0530
Subject: [PATCH 22/29] Delete R.java

---
 app/src/main/gen/org/schabi/newpipe/R.java | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/src/main/gen/org/schabi/newpipe/R.java

diff --git a/app/src/main/gen/org/schabi/newpipe/R.java b/app/src/main/gen/org/schabi/newpipe/R.java
deleted file mode 100644
index 088bdfb0d..000000000
--- a/app/src/main/gen/org/schabi/newpipe/R.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package org.schabi.newpipe;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
\ No newline at end of file

From fda9b591295ef057043c985820e7c4707d61adcc Mon Sep 17 00:00:00 2001
From: Tobias Groza <TobiGr@users.noreply.github.com>
Date: Mon, 22 Oct 2018 23:08:46 +0530
Subject: [PATCH 23/29] Code review changes.

Co-Authored-By: krtkush <kartikey92@gmail.com>
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7e461829..f4910388f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -518,7 +518,7 @@
 
     <!-- Updates Settings -->
     <string name="updates_setting_title">Updates</string>
-    <string name="updates_setting_description"> Show a notification to prompt app update when a new version is available</string>
+    <string name="updates_setting_description">Show a notification to prompt app update when a new version is available</string>
 
     <!-- Minimize to exit action -->
     <string name="minimize_on_exit_title">Minimize on application switch</string>

From 96dac0f9791e47b72fb25f19cd57a49cd1f444a1 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Mon, 22 Oct 2018 23:12:25 +0530
Subject: [PATCH 24/29] Code review suggested changes.

---
 .../org/schabi/newpipe/CheckForNewAppVersionTask.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 9ab0f5d36..e122a5688 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -194,17 +194,12 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
         Signature[] signatures = packageInfo.signatures;
         byte[] cert = signatures[0].toByteArray();
         InputStream input = new ByteArrayInputStream(cert);
+
         CertificateFactory cf = null;
-
-        try {
-            cf = CertificateFactory.getInstance("X509");
-        } catch (CertificateException e) {
-            e.printStackTrace();
-        }
-
         X509Certificate c = null;
 
         try {
+            cf = CertificateFactory.getInstance("X509");
             c = (X509Certificate) cf.generateCertificate(input);
         } catch (CertificateException e) {
             e.printStackTrace();

From 23309e6fdfd11e0c19cfee35b8cd1d38b6295205 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Sun, 18 Nov 2018 19:15:50 +0530
Subject: [PATCH 25/29] Pull request changes.

---
 app/src/main/java/org/schabi/newpipe/App.java | 20 +++-
 .../newpipe/CheckForNewAppVersionTask.java    | 91 ++++++++-----------
 2 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 16fa66e2a..a1f5076fb 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.annotation.TargetApi;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -63,7 +64,7 @@ import io.reactivex.plugins.RxJavaPlugins;
 public class App extends Application {
     protected static final String TAG = App.class.toString();
     private RefWatcher refWatcher;
-    private static App context;
+    private static App app;
 
     @SuppressWarnings("unchecked")
     private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
@@ -86,7 +87,7 @@ public class App extends Application {
         }
         refWatcher = installLeakCanary();
 
-        context = this;
+        app = this;
 
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
@@ -209,7 +210,16 @@ public class App extends Application {
         NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
 
-        // Set up notification channel for app update.
+        setUpUpdateNotificationChannel(importance);
+    }
+
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
         final String appUpdateId
                 = getString(R.string.app_update_notification_channel_id);
         final CharSequence appUpdateName
@@ -240,7 +250,7 @@ public class App extends Application {
         return false;
     }
 
-    public static App getContext() {
-        return context;
+    public static App getApp() {
+        return app;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index e122a5688..5c55ee8ba 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -12,10 +12,11 @@ import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
-import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -30,6 +31,12 @@ import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 /**
  * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
@@ -38,12 +45,13 @@ import java.security.cert.X509Certificate;
  */
 public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
-    private static final Application app = App.getContext();
+    private static final Application app = App.getApp();
     private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
     private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
-    private static final int timeoutPeriod = 10000;
+    private static final int timeoutPeriod = 30;
 
     private SharedPreferences mPrefs;
+    private OkHttpClient client;
 
     @Override
     protected void onPreExecute() {
@@ -62,55 +70,29 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     protected String doInBackground(Void... voids) {
 
         // Make a network request to get latest NewPipe data.
-        String response;
-        HttpURLConnection connection = null;
+
+        if (client == null) {
+
+            client = new OkHttpClient
+                    .Builder()
+                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
+                    .build();
+        }
+
+        Request request = new Request.Builder()
+                .url(newPipeApiUrl)
+                .build();
 
         try {
 
-            URL url = new URL(newPipeApiUrl);
+            Response response = client.newCall(request).execute();
+            return response.body().string();
 
-            connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("GET");
-            connection.setConnectTimeout(timeoutPeriod);
-            connection.setReadTimeout(timeoutPeriod);
-            connection.setRequestProperty("Content-length", "0");
-            connection.setUseCaches(false);
-            connection.setAllowUserInteraction(false);
-            connection.connect();
-
-            int responseStatus = connection.getResponseCode();
-
-            switch (responseStatus) {
-
-                case 200:
-                case 201:
-                    BufferedReader bufferedReader = new BufferedReader(
-                            new InputStreamReader(connection.getInputStream()));
-
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    String line;
-
-                    while ((line = bufferedReader.readLine()) != null) {
-                        stringBuilder.append(line);
-                        stringBuilder.append("\n");
-                    }
-
-                    bufferedReader.close();
-                    response = stringBuilder.toString();
-
-                    return response;
-            }
         } catch (IOException ex) {
-            ex.printStackTrace();
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.disconnect();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
+
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "app update API fail", R.string.app_ui_crash));
         }
 
         return null;
@@ -136,6 +118,9 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
             } catch (JSONException ex) {
                 ex.printStackTrace();
+                ErrorActivity.reportError(app, ex, null, null,
+                        ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                        "could not parse app update JSON data", R.string.app_ui_crash));
             }
         }
     }
@@ -211,10 +196,14 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
             MessageDigest md = MessageDigest.getInstance("SHA1");
             byte[] publicKey = md.digest(c.getEncoded());
             hexString = byte2HexFormatted(publicKey);
-        } catch (NoSuchAlgorithmException e1) {
-            e1.printStackTrace();
-        } catch (CertificateEncodingException e) {
-            e.printStackTrace();
+        } catch (NoSuchAlgorithmException ex1) {
+            ErrorActivity.reportError(app, ex1, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        } catch (CertificateEncodingException ex2) {
+            ErrorActivity.reportError(app, ex2, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
         }
 
         return hexString;

From 939cc56951fadfb4ca612b4432dbeb931b5d19d9 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Sun, 18 Nov 2018 19:18:16 +0530
Subject: [PATCH 26/29] Pull request changes v2.

---
 .../schabi/newpipe/CheckForNewAppVersionTask.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 5c55ee8ba..cd41ac07e 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -89,7 +89,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
             return response.body().string();
 
         } catch (IOException ex) {
-
             ErrorActivity.reportError(app, ex, null, null,
                     ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                             "app update API fail", R.string.app_ui_crash));
@@ -117,7 +116,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
                 compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
 
             } catch (JSONException ex) {
-                ex.printStackTrace();
                 ErrorActivity.reportError(app, ex, null, null,
                         ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                         "could not parse app update JSON data", R.string.app_ui_crash));
@@ -172,8 +170,10 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
         try {
             packageInfo = pm.getPackageInfo(packageName, flags);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+        } catch (PackageManager.NameNotFoundException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
         }
 
         Signature[] signatures = packageInfo.signatures;
@@ -186,8 +186,10 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
         try {
             cf = CertificateFactory.getInstance("X509");
             c = (X509Certificate) cf.generateCertificate(input);
-        } catch (CertificateException e) {
-            e.printStackTrace();
+        } catch (CertificateException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
         }
 
         String hexString = null;

From ad5535af814afc43b77d70237177c6ec13583204 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Mon, 19 Nov 2018 23:27:13 +0530
Subject: [PATCH 27/29] Code refactoring, PR changes.

---
 .../org/schabi/newpipe/CheckForNewAppVersionTask.java |  3 ---
 .../newpipe/settings/UpdateSettingsFragment.java      | 11 ++++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index cd41ac07e..af9b88ac1 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -70,7 +70,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
     protected String doInBackground(Void... voids) {
 
         // Make a network request to get latest NewPipe data.
-
         if (client == null) {
 
             client = new OkHttpClient
@@ -84,10 +83,8 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
                 .build();
 
         try {
-
             Response response = client.newCall(request).execute();
             return response.body().string();
-
         } catch (IOException ex) {
             ErrorActivity.reportError(app, ex, null, null,
                     ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index 157f52a0e..76d887dd1 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -23,14 +23,11 @@ public class UpdateSettingsFragment extends BasePreferenceFragment {
     }
 
     private Preference.OnPreferenceChangeListener updatePreferenceChange
-            = new Preference.OnPreferenceChangeListener() {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            = (preference, newValue) ->  {
 
-            defaultPreferences.edit().putBoolean(getString(R.string.update_app_key),
-                    (boolean) newValue).apply();
+        defaultPreferences.edit().putBoolean(getString(R.string.update_app_key),
+                (boolean) newValue).apply();
 
-            return true;
-        }
+        return true;
     };
 }

From 069654c5f916ae3b704c67e103649574c51bc97d Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Mon, 26 Nov 2018 01:18:02 +0530
Subject: [PATCH 28/29] vector -> png

---
 app/src/main/ic_settings_update_white-web.png    | Bin 0 -> 9830 bytes
 .../newpipe/CheckForNewAppVersionTask.java       |   2 +-
 .../drawable-hdpi/ic_settings_update_black.png   | Bin 0 -> 720 bytes
 .../drawable-hdpi/ic_settings_update_white.png   | Bin 0 -> 720 bytes
 .../ic_settings_update_black.png                 | Bin 0 -> 512 bytes
 .../drawable-mdpi/ic_settings_update_black.png   | Bin 0 -> 379 bytes
 .../drawable-mdpi/ic_settings_update_white.png   | Bin 0 -> 562 bytes
 .../drawable-xhdpi/ic_settings_update_black.png  | Bin 0 -> 954 bytes
 .../drawable-xhdpi/ic_settings_update_white.png  | Bin 0 -> 1010 bytes
 .../drawable-xxhdpi/ic_settings_update_black.png | Bin 0 -> 1340 bytes
 .../drawable-xxhdpi/ic_settings_update_white.png | Bin 0 -> 1468 bytes
 .../ic_settings_update_black.png                 | Bin 0 -> 1769 bytes
 .../ic_settings_update_white.png                 | Bin 0 -> 2037 bytes
 .../drawable-hdpi/ic_settings_update_black.png   | Bin 0 -> 431 bytes
 .../drawable-mdpi/ic_settings_update_black.png   | Bin 0 -> 379 bytes
 .../drawable-xhdpi/ic_settings_update_black.png  | Bin 0 -> 710 bytes
 .../drawable-xxhdpi/ic_settings_update_black.png | Bin 0 -> 1091 bytes
 .../ic_settings_update_black.png                 | Bin 0 -> 2029 bytes
 .../res/drawable/ic_settings_update_black.xml    |   9 ---------
 .../drawable-hdpi/ic_settings_update_black.png   | Bin 0 -> 431 bytes
 .../drawable-mdpi/ic_settings_update_black.png   | Bin 0 -> 379 bytes
 .../drawable-xhdpi/ic_settings_update_black.png  | Bin 0 -> 710 bytes
 .../drawable-xxhdpi/ic_settings_update_black.png | Bin 0 -> 1091 bytes
 .../ic_settings_update_black.png                 | Bin 0 -> 2029 bytes
 .../res/drawable/ic_settings_update_white.xml    |   5 -----
 25 files changed, 1 insertion(+), 15 deletions(-)
 create mode 100644 app/src/main/ic_settings_update_white-web.png
 create mode 100755 app/src/main/res/drawable-hdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-hdpi/ic_settings_update_white.png
 create mode 100755 app/src/main/res/drawable-ldrtl-mdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_settings_update_white.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_settings_update_white.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_settings_update_white.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_settings_update_white.png
 create mode 100755 app/src/main/res/drawable/drawable-hdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/drawable-mdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/drawable-xhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/drawable-xxhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/drawable-xxxhdpi/ic_settings_update_black.png
 delete mode 100644 app/src/main/res/drawable/ic_settings_update_black.xml
 create mode 100755 app/src/main/res/drawable/ic_settings_update_black/drawable-hdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/ic_settings_update_black/drawable-mdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/ic_settings_update_black/drawable-xhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/ic_settings_update_black/drawable-xxhdpi/ic_settings_update_black.png
 create mode 100755 app/src/main/res/drawable/ic_settings_update_black/drawable-xxxhdpi/ic_settings_update_black.png
 delete mode 100644 app/src/main/res/drawable/ic_settings_update_white.xml

diff --git a/app/src/main/ic_settings_update_white-web.png b/app/src/main/ic_settings_update_white-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..60383b7901b4d341b2428782840b828ef3c65f9d
GIT binary patch
literal 9830
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index af9b88ac1..706fec186 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -225,6 +225,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
     public static boolean isGithubApk() {
 
-        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+        return true;
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_update_black.png b/app/src/main/res/drawable-hdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..cdd51d35fe0bb929bc605d41b98e3bd31580b0e7
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%ib+I4R9Fe^m%D2eK^(^~DiWXI1z%W)SZM?i5)myFMJo}ET8h2tlvDg8EG;BO
zGz76y6ve{IMzoQjAt;Cl=0t+8)A%^^`K~+1?6`X~ySEm~{or#uGr!0Dc4mLGdzDI8
zx-0OXtw2wQ_p<{3b+9sy^O5T;e2M$HFGUiPPd^-o-LM9hfusTN;0{c}EBI@oL{>u$
zKEN*zb@ZoTIg~Doh`1B(gD(+Re;uDeD6$*4rOOtEr=bb%guebyd>(_gxfIzzlqv8{
z?9)FYh6<n~QT0rKZ?aJR6=L<~%}9H_8Lq-7(2|Ev=(AG=9)e6+;%Jn}IXDVS9i7`%
zqL<ylxPOxC;uKw#vHfrl=2P^Ep<#MYz;~BM|25&A>_}(q-0K5$o1ksgX=Prv3E~D-
zzi2`x)^lQP19Pa-{4IKL#~^P>cbbq%>>6|LfR=2h^%;yo=(VhbG~ZJgf=Dj%8=8b|
zS7t(rdkd<nvV9OD&oI(a(1?vyWm$3-g{d;V%T9ov({{2K<sKP)1N+Xi+A7mCa>yz2
zk#AO9d;ErChbAOPJ@_?P1wN6DZ1WV$TLpaqc9y=jPVWowN4YX)L^|2X))&v#M~}gH
zPA3KU0i$4^6Phj2m~^tSCktuo)lxYK`s568ux-BMa~|yNQ(I%w*|wqWoA_1w;C8_P
zI={3vy)kMRIn$JI6OKS62l#yrp?6~2se(?&gjSR7Z<4u7jI|Jn_Wc+XO-hHPa3>1w
z&)~ZY5-(hJw!%XQ4OE8R6!Q&0luRNc1||AiGXjTUJ?Ny>M}C>2t*wJz7nk5YM3R<}
z(djJN2>R=jR^G-g?^Ua+s(u4=d7ZoV-4*!fR$u|=aQRftDBw{50000<MNUMnLSTY<
CSWVLa

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_settings_update_white.png b/app/src/main/res/drawable-hdpi/ic_settings_update_white.png
new file mode 100755
index 0000000000000000000000000000000000000000..544a85c9da5ab0e910e120a84ea8b3a5e7c89615
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%ib+I4R9Fe^m(NQSVI0PHEy7BL4EurS$WuQ+f(ofaQRFEED-Ru_d)*2v|Bw#S
zK{p~g6^YTIQy0;Tgi0ug2xTl`W@@#rpJ#e!chuQw-gl-z*#|y5Gw=8PzV9>dJMTNQ
znM_sH5!hxUkWF$w#bR+U`3IoRw6nnRb2gh@GS}7zYeSe&&Jnl)=U^Y~2I&XnVGy2S
zY=+~%k&HkCbi+6Jo93u+8}_8`h(>GREW86-y&&NPSkFeq8=<jdFafJzs{#olplMDn
z8af0YAgP9FKnuWKG*AamlR63H_j6ur<%k45ye*J}@1P-1OL-b<k216~7^HFw*AJi*
zb_HW0=LO1oL&{Zj3wDIW8Y#O(KX2I*Rzl+CA}XDMQHZPMa`yT&8d#2K<UO%wsJ!Y3
zYKo@8My`hZJ|;Oi3I3+~=dLKwgZl(*mvmA?bm{3izo$xL%tb3KdLg@?v<#`&F*q$#
zHE<Ks-`>@Fd}%Q~!c?PH*~OT7<J8N6UZ9dzStZ>k;IA^>Y!|50C|w|UK7*^D5JxLi
zx);@ASWG#f+&Fq^V@M6^!PncqKCJU#nd+FjHjCwp3{8QJw0rl!`sEsMqnN3qx;84v
zP@hePsr#GbUGSfik{y+qnCjRnFGE*g$u^Vvzu+O1rcdXlOfeU|lA--D;F3*__AgCe
ztwHB5dm3rp^V#7IH5Zp*R;3Qo3c6#6yP7t3vr54mXz~qd-minJDZNaiUZ{j4^^s^B
zlwY{Ifa5R(|5N%JJqn(gvLmxj2<UIkHMj}~K|8HpF=<NQLUZsM9`kK9?>D~5kRQO9
z_L;-b0GpP#U(exKBu9TFKVjsnLw+@-Is#j31l9n>h3cDEjU>SU0000<MNUMnLSTYb
C7)K8P

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_settings_update_black.png b/app/src/main/res/drawable-ldrtl-mdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..d85ec5975eb95bf4d6a111dbb9c5c353f71c95ba
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$x=BPqR7ef&l*=nbQ5?rFu`nLxQ6w9RvS1^5m58#pv9e%mqhx6z;=i!4wy?7y
zW?`X_k`-H0UU|PCpYLtXbex$xXJ$XY`rLDV@0okg?*u_!Ja3@D<Cj}8RZtBjAbEu=
zxRa7ed=1J;ZifNrhB}a3z%In$7+xS}sUc$u&fqtK6YP^v2{}nA(R1(yQN@k@iI`c4
zfme!&Xn}Ef22;ehJ`y_$DPn(vX1v4D2R+aPM$}->D2cU;)y_Xe?+5*`6lue<3Q@1*
z3*VrFZ1z9<K_7!gup5U*aLoy}6Se;YS7dYJj<Bu31SCJaPQf?0!M2`l1Cw(}y?KZg
z@lb<8NGAsvA3%TKl{g0FRX~U1tVN#&%}AgVU^=_&CcY8q1y^K~Pcd$u(dEl{9B=V2
zfaby#+2m7<Dd?{EO4`p5poAM(1bdLQmrXvmsIBYu1~Z-@(`1P_U3NlyUvcGaLr@Pp
zV0TWpSHa~3*%a4IC8xU+WdqU`wrwh$O>s@L?y@p7aavnJSH%!CfbOMS<%5J%ScfgR
zHVxQ^qBE^KUmr1QHp0M&hXz*1{v6&TV)EwyZ{QF1J=`8(Lv9!V0000<MNUMnLSTX>
CMBifo

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_settings_update_black.png b/app/src/main/res/drawable-mdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..964553137f8d2d1138c49f86c6414fe6af9bbad9
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$HAzH4R9Fe^l)Fj;Q4ogX-9ig1v9+?Ww6*ay6blPMQi<6348b~Gn&cTQ^8yxv
zU~3^-i-9D@>-WPMGAxIH*-hmPe9XTyb7q#|?AB^wv4Pk?Y~a6dV4=hUHaNQrTQE%E
zW^b#ExP%Y*NsRCpumUr+Wx99Z6KuG7y-*vLpmJNJ;|?^y27aO66VetxM^|cVbZbH%
zY>50F93-SIcZ=SH%It(r-(UmGcijYOi<`eDrk5{m4|K4m-gjMRX`hqUJ-Ko<Q_BG-
zee*Y-k22j3i7Dr6pE7lS4&4`;YJl!T-E}%kF+W_o=W3>wr<~MnFE)QAcAStd=Jl-4
zvb5>P(}LUpef$20<ZB+uZNo&Ho0uIZ=aKuc2kYZ-R_Tj*fg5<vRzxs15F3aM#0K03
ZegP-|Z*l3MaiIVJ002ovPDHLkV1iDIq>2Cl

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_settings_update_white.png b/app/src/main/res/drawable-mdpi/ic_settings_update_white.png
new file mode 100755
index 0000000000000000000000000000000000000000..cf4642f9720cf549caa4d3b429cff1e6fbf63549
GIT binary patch
literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$>`6pHR7ef&l(9=3K@^8~)kD0fkV_yEQV9_(v`~(y5fzN2w-6FY;T1M%gm9&W
zApQ|4EUi-5S!j?HDH1d&hm{s-B7#vta~c)he80`iv3K0;-t|8C_Pu%U&3m&uv*UU9
zlJEumgt!+3fpRkN2wF`3CHlzs{Zlh`s@Mh;Z)0XJjKKhOfaCza!WSse=mK4zQ2a5x
zhkbC#E`c08tgAW`9>5&@g(UeyLLSnIO-M>X7rcWa)GFsBPF8DB+5-}vlkf^&!XR{l
zl>p<L9T@!rU7C;m14h`7qKStpOrUrVqdZJOa~LUq+%lXfcX?}!8zVj~;thO<pET0g
z(=p7zCy0}qFgfxd`KHQ*ZG1~G4gWVDL#N;t;-uCFw#FgGJfxdgR1O*<i;J3D49?&#
z>NK|g0nKZNe&e(13C1iG^oeu=T(VB!H4NFAR?BB%%5llMR^VE_YW2Y|>}XIS@+qbq
zmt^$@o38f8e~ey$(vKwD_!NtiGd1`SmtkTmv<NK**-6Do2{wElPkFy(7<Ij;@t>eS
z8hZwvF}6!x5qKL0X_AFiND{5OmX+(8(OuSR|77WI&{Z)G&maZ$$~6=AU<E$&H~$VB
z*eZ0?nbw`J4UIcpc1oqzm2wWhD6UU*FUeovAMvHfMi%B`TmS$707*qoM6N<$f&g*#
A#Q*>R

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_update_black.png b/app/src/main/res/drawable-xhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..0304e6fd140ffb51dd739b070f914e295fbc09eb
GIT binary patch
literal 954
zcmV;r14aCaP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&bV)=(RA>e5m^o+_Q4~PGYc%dL5!6&R3L+>33vFx^YefVbK@eM45Yq%~6txgc
zVQFcjD1wa$HX&jmL_|>$_qeZdU(fku!espOXa3CpiNahsnKy6lz3;yJ-@LgmrBWe9
z28s+687MN4BLib{*v6SQ^I$Htz$9>tPw)z!z*nf7)N2A0h-fKvz+#vKGoc9_<1@U0
ze&~bCa1(w(F3CFq?G1bbEQdufAL7J-@56QIfs=3-Mnxtw>NdCl1Ms^>UZQ^%*1>of
zQE_=3f_qSF;8Fc+_}B|3WJF{-qa25~5Dg~l{Zo7$goaOI9D|to50Ew3IJ?*Q?1Hh-
zFxiA>2Z{?KZ~t?AZ)`;LzGUri8}bI3WPgh>S|PXiQ!a!~=!L7`HkcGZ-sg_d1*s(N
zJK$b^7?y$Am<?&f;9n#tw(&e}+`!bOv;aN^9dXx6j@F>u4K5i=fm*~eVM&64+h$XO
zj)_<grxW!4dh842mX>uHSTZDuI%)j7Rr~H$N^-?9R?=&|lE!(QPCX}J0ci2}0Iad9
zt_FY7euxV!ZGSx{5FXQyrq%3fs3=G24I5-_H);YwJo-NZ!<Lmh%+LR10#3wOtp<i<
zJFQ@bd9RKB1;X*UOO=0$^IX?@Q=@!C|9iy7ZPZ`1nz)vu+o%VkiPelMJbOl;TYc#<
zglCqvy$`!7;8qug+o}@QwXF|*r5!h{x7m@*Vz@JH+fV*($WsDqtB<TD$|-D1KOk+;
zQ9WO%oiG(@6>YT5vw=KxP}fp4uv+d-zz&!OX+>Ra@+8j~eGf~Qpq79u>ADOJXa*#S
zI_hR!y5aH56WEWlaA(%G&XOh(1g~z^al&?%8Ra^|vNil5Yujzqb?u=)D)#wIovi+&
zc4r*KgUh)(I{kvL=p=&ReHINO>%BYI7AVUK{yu`N&Z2gHk$1tYL2TO>)ys2#2Y*8!
zO^c&FP|pLq%hEkw>a|3J3BSYVRv0GM+XukoT%efuI)E?9>nCh)GLAvT^MN0iPUwTM
z(ZAC6o7D}iP!|7D6&AO*Uhr_^OJafLI`%~$O?l7YJ#Yd%54hCJGVEXwbPitUaa{!+
z&<-tN?J`o6F@Y{Wm-G#|2v@+;V@Rq^AW*XObpmbB3?n%KGw-=LIPTIcq{u*#fg%G%
c2I`oBKfw!FKOJ^iGynhq07*qoM6N<$f)wPjaR2}S

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_update_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_update_white.png
new file mode 100755
index 0000000000000000000000000000000000000000..9c71b13f7982ba89e77f96beeed0cbaf96a5b69e
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&tVu*cRA>e5naOJuK@^8)CQ%dDXjEM0q=JG7DuV~TcoHvOj1mz<2#6OiZXo93
z(HOm%g9rZrFNzC#Py|H;5ibd%s7Tzhxs1_lGcg&zU+kVtW_o%$-8Ewl{ev&PRJ~X4
zRrOR=cOsEcVGo2o5cWXW0|9y<8o<`kG?U59rC=p2ff`U7L+~BCqS0uIqcIstfS_j)
z(Pl`%MpzDYFbCAeFeITH+Tj_zCYf=LffOhK0++o4-w)eh1FVK(QotYJB|L>|B=MeO
z<wfwda1<WE08CfkFt`PKp}L|O&|n?3LMH@O2M*3aZAFrxp@nb-eu63W;HU-4n*<G1
zfqMQonAQ&*o`YD~Mgr#tK@F8leK>A3o&Zj(Ar5b$+<HR;OT8vhbhvO5gZ0pivnOyH
z)_Qdupx!!ck9oCsTn7kRbNNNs0_u%=@S+TrzLu!CjB>|zbL{#!U&9(Pm~+qZw7?O;
z@1kZK#6equ=}6mzO(hIEDAx+@CUryu3EXh2R8U6nji4#bue4=w6^@5JI@eUK-(Eo{
zJ2pVY9gu_|GMT^-fpoz~NPy$hFp(XF8q!W!;h3HGn<EUn>taM(O42bHmuC7Y8-oM*
zzn@#ro`o)OGidO+eodb*!lAb3+B;o>$;XO|dKd!}GWiG<i$}4x+C8KZI0W`c*!O4h
zQL&yPi3SB3<>Vg6-MW~j($pW#vq|xcx~>_tr#G|wX;d#nv-5nFy6mMwJc7e7;74aM
zng^QdvXp8yx2|<AAM)i#hn2vnA4_b;K||>}>$oK(Tg!)h`O$SH@W+p(WuqU|37GE|
zs8gA2EZZOx$R{Px3qhm~I1US(0(H8lx|U6l&cj6}tppzFETHrlDhbWku2LPVuHQ!&
z^Q_XEk{-LZ=&evM<t@;J>!L|mWldIH6EE^T8UgJy2El|<IMHuH--M<}_pCD2F{PVI
zKrb$LOnJo52uw+WYdd(AnUZEMjb=niY=_ULJmW`O=9944Lg!w$(Ny)Mchvf~XmX+z
z`81e(Vb^1+bwZeWL~%8te*PZGe@1J#c^>p-z?24XBuq-3aTyA?<lNNa(hTh|6Qwn)
z4YFS?Cim6Wcu=T~)gIUfTR~q5s^EX>7mdGwyKt2aW6}<$AOX98L{@RW6B3{oe7#U;
z-xGsMNMEuCKwl_c!9#dX@Om@Ls%Qds4HD7TR|)8Ii2iv|$pqB%UC>S7`ce@p?18Wc
g!X5~Fz-$lv1&a_iItI`d4gdfE07*qoM6N<$f*x(b4FCWD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable-xxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..7316dbc88983770f1f9f3e5c166336813c796787
GIT binary patch
literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px(_DMuRRCodHo7;<3RUF4hQ!7out`<dV(}M+3Nr6!G6hRj%LKIOV5$Qo6gs6v#
zLF!4mP*UN87`}x6KnX?llBE$nD54R{L`ZbMm|eWo=QFs6GuyMz?0wE&Yj213gAe<1
z)>^;c`kr+^Gebkkk^)JAq(D+2DUcLM3M2)R0!e|SKvE#K0@ETp)ZZnr0B(R~a4Xyh
zzMBi$?{Ewb!{_iBjKX*DH%v*pj9RUQUGNp0hW|?P59z*yZE!za2vf#pQj-;M6s%}j
zQM#o&L;e%67w&}EJph;WnZhguTg)lwR^dV3{YsfH!a_Ljgt~~JH^5OCM1(SV_u%6}
zxB$)z^V{44c84+*tRu~Fd@YC8+toz49qOob)iNCPpN4tRN;9yxV9<fMsxY1D9l%H6
zVrZ4wtu{etuua|Dl2$=$25tj+1e$C)`7h%S;<>LaBHctF2O%G1)6e^fX$drDPOEd^
zC8)A0jwPHi8QU!A+p6|c7k|TWH(YlXo3i_;HrlrY<<`X36x3!=x<Y&mN5BnZtd=mS
zpRL5&w@uc96vmzQW~g%^W~G0GDt0-ECyTdRdH?d#_1VweKAh~G0u-6!%i}NtR~9Ae
z^Zj4sd$?lW4@f_|Vjhz_23e0+eW=T(Q_!36C-`mGjpsd8%{=|a@d<gYQ!O^1Qg%SU
z!Ia4tTcA<u<8s7vq)Od1-^J`!&%jEUO6Cyp3LFC$k+!IJ!A))@dyLdER>ZMeP`*{4
zpq@W~lTYb&(lCiVgvu8d;<;&oI_vZWb$$qXj!_<#zZXdygKLvO#$#980)?jlu5o^Y
zPGv*hw@o1H>H*(t;6OgX9GG`PNI~*tw^5)hMklEWwumRE!7M?HYnugfl3LxV(4&#X
z@e63PK*nc-af>zNI_O?+YBc+@Ym8pzR->xzCPU#MdbTik?mcItl1{H7-5Pj7f$k`o
zscf=oB=jfZr+Q@YTdHd7$Y9w;=GjlL&x`VPd#^4|{oDNTC#ZYeIZ2t%L5$z3^r0_(
z)>#jG!aWe=S5E_VwR+Bspu?I?ANs0OoUANcWzgeNXM~q^638q&<ksj@;|{$*v;xn<
zOr6zamSveC#jzEQ9qJw6CTmimuI`|%P+ewOmKiGEtlU!uyeonu9r|s1<S?jNM(CC^
zL7<H|%wB}Py8dy-DSgC1+RV&jUdsp_XIB1L7rPCIp~s=jp;vu94^_=PG2=8=|MYL@
z3iuE@D-rtMUmC`yP_AXnwB`vNSHAqM2Itb;wM6UyT)Q~f`o~s9=4Yk}wa&>4()oN6
zzYk=AxiR}1IupdW_XKk!3!=-_&tjc&=Igs3-~M_$ZclQTPZZ<XsnpZFy!p=0V#JX5
z;Wk76?#af@J<U6C8uA%JKl}TeUCG_Lc<;N=ev8UKg74em9J`)3A3;&ZkngkZHiG}A
zx>Z)c^~6wkY;p@9e$$XhS%6Jl?OLzHq_&h4Zq%CSZcT~f>iliE6iV4*QtgD;(|=O}
z*>WoXos+xf4e$#zHKT+S%r5mkJOKmQFu6Cw9%y3GR<}rg*@xf_a5yO(kgJ^Gx+b^^
z?0R>>GPoJ8g?=`lWQ%Gp8=SuP!TaEU4~>FjPoY&2sHhOtSD*=ts-naVy|=|=M<fk}
yklZE(k^)JAq(D+2DUcLM3M2)R0!e{!1^x%BIF=f}R?-Rp0000<MNUMnLSTZ@K8=b1

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_update_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_update_white.png
new file mode 100755
index 0000000000000000000000000000000000000000..07b1f712d00ebca3c8fabac623ada94c5b6aff15
GIT binary patch
literal 1468
zcmV;t1w;CYP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px)c1c7*RCodHn_q|(RUF6fRo8!|5rt`3h^~|dQA)u^qAy}dq7hP*i<CX2gtSn(
zu!^k~h-f_|i4Xb^g!CAMC?@!zWr`TBEC|ak3rk3?o0`^cuHHW1^$yP6nS1Zdy>rgo
z^`0MmoSF0I_dDl%XU?2+X3b=rIR%^oP64NYQ@|<U6mSYS1)Ks-0jGd%1+q2+=5jg3
zdk|*AJZOUFU_K~q8py80?{Epu!5Qd<%h_ypkfSxTCJ^F0La$cC3V0qQ&^U-<|52zD
z&cgR_0-=UDj(tOz26zK{U<j(QJ5>G$et{Rk+7F!gFG1ra%wqTsh9POYio?%f4va0K
zXz*nC0D8c*{X~FQVSM7hvI&PYGz+^ykAp3{L7=rJ`je<n8aWFN+EQgyoZDP~0@D-i
zR8r2=FxU^(4#c>q*ffA|hbc+*D-l05NRL$u)Pm_wdJAe};8sIm4WxPJ5Wc|v=4u6`
zFA|Md2%S)C)<J_7RQrfToyi8`5PUp5K*qc9RG>im2@7e$2HH5Wnx@3M1qs$butrz{
zPvp_kLF=emv_2ZOl4VJU(Z(Un1kf{m61rg!#)^GajW{LmAQYH@bFH-7A<2nY4uAa+
z#~!6{$@Ug;riJb-?xKMr`6ZJjK&T;(#+UW59cF|Usyy*us%m8)$9|;n)HoILWi<w=
zA755bH@phsjDxS?CYUho_rx+9alML$oThF?FQh;v96e0S55h*M<QI$8aZ80~6X$9A
zHVI-qrUj1}mGxL{fj2ER+*TM35nq6IDK&{a&G881(hZK$jf$^>jTy1+M~rS2nAU86
zLOVp8CsD8wv<YRy(iX_y$MamQg1~U2TWchdOl_8HzVMI|>&zC>-@~vA9Rj-mo@%d9
z;H5ef#@}6yy&r)@n&i*W>s*<upf)#}{H-;6uD9D}_|P9lcaTQ-rT)Y^Ki|Pkv(D2%
z0_nrulU{;5X7pD39Ferd%4i<6Tqg<I9ef=r<4;SCxOS8ZfkAYXla*Y1<LaoaSeK7e
zx*3snN}v~FRV`mw&+=u^pjXUt#WG5yzeirFS@51R`6XNjvZRZ~<pUX1x&letEgWtI
z<KL<jBOgmKlQey{S}K7|eDzdAHCxrP#i%JpJ{E_>ZI1-fR{&F{Wy@Yu3duK^TpIl>
zfv$l`QwQ3hAt|BcEAP{!IE2XcOQ4H7Gi+Kxw<Rc$1eZ_KHY|bk*B3TSzqYm<sxtWi
z(|3-i$FSxMr>bgk^varmZ6vbZZqc?Fe7;pjb>#zM*Y~-Kb9&ViDE9V4oG8AslR5tw
zDtWu9j_S&XE$fm%eQ@4ZMB->syp6j-6T3*3FT0JxwindrB+wN&2DiYL>5aCDj%%<j
zdPgWvWmFatdkaSF<S^y5yvb;wo)2AM+q8qJ&q|@DJg~LPNvHzr;7VVQ?;02H7i8PJ
z&`f@}*ADNfG%z*GFV{OQGZbHIvb)BG)-;E~<jflPp{DO|dfcYu(YdK_a=0#Q`n;~K
z*pcmy5ry~!B4Jv&m<h{967Bt??{9iTdB0c-=SoY<b`khj1rKZ=Akwp>{{Z)%Kb5Qx
z(>BaLZkEkncl8!4FfxB5;Wan|+We{)(;qo}1E2ak91uvEh@^SZ+wd*eeEkzHH9J7$
zR{A~=xdl9KS~cqr!vBJ_-YA4NW_nxw0q+zOB`^ks6~sX!>CLblw8>v?Z<r!AZMSJ%
z7o31YaDh7~bU2A55Dqk%)Enk8m<umM6FdX6!PerDP!-!vYIeg}I1U$}7hy{Nuc62S
z;Vje;PUDya@?O!Q<x)=6vSA1@D*0HDa?@RSr+`zyDc}@v3OEIv0!{&^fK%W;RN#MI
Wj2jz)_FF^%0000<MNUMnLSTX^60Pe1

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..8186c6f5f7eef0a3e6c135e510db6bb24a930715
GIT binary patch
literal 1769
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
F`~%XSQ9l3x

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_update_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_update_white.png
new file mode 100755
index 0000000000000000000000000000000000000000..8b5e6fa38c671e03b2a0b8eb31772031d01a6216
GIT binary patch
literal 2037
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
D7x<mW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/drawable-hdpi/ic_settings_update_black.png b/app/src/main/res/drawable/drawable-hdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..1e318eecc2817d0da257bfbfd8b96aabca214f04
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^T<nVv3=AsMW1
zLw9>IJBsuwEZMZhtXJ?ObIx*K(VRbg-8F4%|1~c7*Kp%@WaM&h2M(2~V#_+`1@rJ6
zzBe;=)8@QFJ(*{P@8?#(yLp_4%}7&$bxDKB1g0PdE)PZ!$6+_uoQFHq6PVXDxF_&@
zxp(g12k9TCA6oz3Gb_rSurBKv*T%h@xHqg+%6j`&p#D}nU!TJxxd*EgCvN=~|9^L5
zJI~7*@uAA<g#qE&{}NYmv{oBVzwrFIH_O?EW{Vw9s=5x_HeQh^_BeXUyi?d~ZG1sN
zAJ5;7Pm6vee*UMCw`Y!y(K@%%V-Y{kn|}Jv_tR5A!EpKthxxAae!q6f%U)O6)^fFF
z^+fl=uG_j=OG3Wbi5on;^M3iUeud>Xrc4iiXZlG+Hi>ipxnA>*w@35>TkCse7OMT*
z?l*(o^@qy6=&VP27TYhD+?W0!aMkUAp#jURTVkB^4=_ErJjoO6c|=HDn9Eepu;Oc!
U)=K@?z!+fgboFyt=akR{04@o<&Hw-a

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/drawable-mdpi/ic_settings_update_black.png b/app/src/main/res/drawable/drawable-mdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..964553137f8d2d1138c49f86c6414fe6af9bbad9
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$HAzH4R9Fe^l)Fj;Q4ogX-9ig1v9+?Ww6*ay6blPMQi<6348b~Gn&cTQ^8yxv
zU~3^-i-9D@>-WPMGAxIH*-hmPe9XTyb7q#|?AB^wv4Pk?Y~a6dV4=hUHaNQrTQE%E
zW^b#ExP%Y*NsRCpumUr+Wx99Z6KuG7y-*vLpmJNJ;|?^y27aO66VetxM^|cVbZbH%
zY>50F93-SIcZ=SH%It(r-(UmGcijYOi<`eDrk5{m4|K4m-gjMRX`hqUJ-Ko<Q_BG-
zee*Y-k22j3i7Dr6pE7lS4&4`;YJl!T-E}%kF+W_o=W3>wr<~MnFE)QAcAStd=Jl-4
zvb5>P(}LUpef$20<ZB+uZNo&Ho0uIZ=aKuc2kYZ-R_Tj*fg5<vRzxs15F3aM#0K03
ZegP-|Z*l3MaiIVJ002ovPDHLkV1iDIq>2Cl

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/drawable-xhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/drawable-xhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..049edf0d876c5964133ec3e7ed787e284ddf1954
GIT binary patch
literal 710
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U~2GmaSW+o
zd^^oHThvjcP1u)(d$AyQAU7w+v@D&_Yi=$%e>DHGtQBbzV`I4(ub}D7WVTV{;F4~I
z8xbp3ENIfun)SR@Hsamf!t}|r-`sm${UEjMe9hd?XO6$SG2<+Y&jFn1pEA>9-6vKj
z=eS=`+_HVnf9t30U-<s&)GCL+QCh5>A-UHr{$l=@)iu-dIb)r6U-Y<XxT&&X%A5OA
zE6>)Ji1fCcop7``WO_yZU*lgg?#{XF9se|6`RaYIZQU1~q2c?yLhh;B?5y&B!;*TQ
z)|YMe-Fb^mrxZU6?qvTjeay0P+fg+(i&rMeXBTFBod3V+bqH6$Rlko#+h1wS|9aA<
zKhE`))#FQ%@eYYsU!77C+F7%*&VPmQg2O9%>&2J(-j-V>w=m>`VZETF-@b_GpZ^w|
z&yc<A^gAFuXPSo{M5Z%tU&QSh{_$e6y}Gv*^1|o-Y>w_*a+5(kV_od_{gK=MU2ERK
zvi=+Y?dKQm|DEm%zrFMNljxNe{-4$u&)?J?GRL`lC7bor>-M!dv%_lhGbb}^9jTeg
z{&i)aV0E30)t1P*lN=!jwH4P!%@s8{;c3?sX?}0p_4P*1Ii*SazHhnuYMD;?)5ACJ
z2Qj~0@?ULoYeSKjW5?STruuiM+AF_A=G;9eaL`?(>6GTwj8b)z*q;W+=U&^a&hYoY
zy^G?CJ3#_nLB8Q}#V_tZHhI<Zvii=Ga0`c^N3%WS{+51W*>9}Iaf{Qp-??F8bk@_U
ze=J_j$#gAIzvG}E@J@Y`-cR|SrQH7MakuvcYx~=n2^%otL=t>V((ikkB%aAm*bYpX
N44$rjF6*2UngDR^J5c}t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/drawable-xxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/drawable-xxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..10ae87baed7fa8ea0d0b78de6bb76f7a65ca5c83
GIT binary patch
literal 1091
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VE*gr;uuoF
z_;%Lm)xLo;$JduXs_L0?oaOp#BgYlH+3&fqxv;UF>Zxy-wBLcPt5aplB%=ckbF|Hu
zXbX2Ws`T?1d^n-J{`~fLXWy2bi>rRW`Mq8G{ojADE`N73d+q&OuQz|YmA<|<FM9T2
zwwwbLqXlo++NNeO9Jah3X&}7ppo#={{X^}Vw(t)!afk9Verg<M={feuD}v42LD)c6
ztx3({<I?H-I4cf4&wJ4*|KLPMg56s_M^=@{@M@tgQh5!x&M~@sF-Ogu{ZMI%V7#s6
ztPbuCf~PjzvON2&{oPmVhm0ZIXMg>)+qtb-oso0l4VTvA6GF@Omi3=lIrTw@;f4uD
zv1`Aom{tAJ+i9KjOa78;vc%uajF6(3-}X=JSr;E@Y%Gi5-R<bFGhe|kK`!-I(z}*v
z9ci_io`0+&7`+qOd|E#SxWp`*EW1GT;+2eJEIMgNb|+}-FxY-w(z&?tlsnT?t!s<d
znw9E*Nz^!6#8%C@&+*!A&lBO7_WXA0WQ*Rp?pyYP)cGMnYpWFXx8Ay9b<K6r-wnKJ
z&c^T9N}_#U9K9L2LRIPQ#tV|_XTNv5<U9UuE-n!GvME2{Se)C{6S>RxUzxDrU+LvP
zf9D<9<zd!hr2#bZU;6|%x0t&ZemuUVrg_<|z<0%Dqp9nkr+m$`JNaPp70zB;&%S`U
z)+I*fR|4gpX38^e{<5>x&GpOVr*~d$jdVTOsC2G6Wv}sxk2~r-P71}E?3%kUac!-W
zdgUUKonKs*>^<dqq5ELaaqDw-Tb^W34bPZ<e6NL4f6>)f$|Y|M-g?PbeHW6-*jseB
zdodf&id@!LPx)o{Uv;>zd-;nmGn0x3)8;iTE4Jr)6vgcP#<{fL=HC0|v7Ca}ObQE&
zCQo_!Hs|GI3uO<Z8v%2<DkrUJ>8M&IeQNrWKc<yl@{^`rw^P_6r1a~Q_dc~3YE$gg
z44ULTijJzTR6Zye;(mm2s_My!Th1-0;F`3;_Jggv<<-do6Rq=q%AeTD!RETfxXbv$
zi`6gwh3DN@ad~n!dfzWg#?;#fi%)%Zejm2Z>E2`mfls?F&pX{?y?Wi$K=qgF8=EJU
z)|al%QlGS6jH^?y^~<OI!nvou^l$!^n;_%U81_^3mGbi<);`BXfBUmid-e${y<qvv
zoX76NW^35nru0aCZpPxJci#o?V88xQQbg?RtcHDzUO#LyS~(|FybYHzOJJrH1(-4a
aXIOPj>GJ+*WzN7-fx*+&&t;ucLK6UgrSE?L

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/drawable-xxxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/drawable-xxxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..49ac8ea654e4f48096c13cdb32633705825c5981
GIT binary patch
literal 2029
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
T%FJM|zX7)&y<O^^!pMICySl3e

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_black.xml b/app/src/main/res/drawable/ic_settings_update_black.xml
deleted file mode 100644
index 261c31217..000000000
--- a/app/src/main/res/drawable/ic_settings_update_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_update_black/drawable-hdpi/ic_settings_update_black.png b/app/src/main/res/drawable/ic_settings_update_black/drawable-hdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..1e318eecc2817d0da257bfbfd8b96aabca214f04
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^T<nVv3=AsMW1
zLw9>IJBsuwEZMZhtXJ?ObIx*K(VRbg-8F4%|1~c7*Kp%@WaM&h2M(2~V#_+`1@rJ6
zzBe;=)8@QFJ(*{P@8?#(yLp_4%}7&$bxDKB1g0PdE)PZ!$6+_uoQFHq6PVXDxF_&@
zxp(g12k9TCA6oz3Gb_rSurBKv*T%h@xHqg+%6j`&p#D}nU!TJxxd*EgCvN=~|9^L5
zJI~7*@uAA<g#qE&{}NYmv{oBVzwrFIH_O?EW{Vw9s=5x_HeQh^_BeXUyi?d~ZG1sN
zAJ5;7Pm6vee*UMCw`Y!y(K@%%V-Y{kn|}Jv_tR5A!EpKthxxAae!q6f%U)O6)^fFF
z^+fl=uG_j=OG3Wbi5on;^M3iUeud>Xrc4iiXZlG+Hi>ipxnA>*w@35>TkCse7OMT*
z?l*(o^@qy6=&VP27TYhD+?W0!aMkUAp#jURTVkB^4=_ErJjoO6c|=HDn9Eepu;Oc!
U)=K@?z!+fgboFyt=akR{04@o<&Hw-a

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_black/drawable-mdpi/ic_settings_update_black.png b/app/src/main/res/drawable/ic_settings_update_black/drawable-mdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..964553137f8d2d1138c49f86c6414fe6af9bbad9
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$HAzH4R9Fe^l)Fj;Q4ogX-9ig1v9+?Ww6*ay6blPMQi<6348b~Gn&cTQ^8yxv
zU~3^-i-9D@>-WPMGAxIH*-hmPe9XTyb7q#|?AB^wv4Pk?Y~a6dV4=hUHaNQrTQE%E
zW^b#ExP%Y*NsRCpumUr+Wx99Z6KuG7y-*vLpmJNJ;|?^y27aO66VetxM^|cVbZbH%
zY>50F93-SIcZ=SH%It(r-(UmGcijYOi<`eDrk5{m4|K4m-gjMRX`hqUJ-Ko<Q_BG-
zee*Y-k22j3i7Dr6pE7lS4&4`;YJl!T-E}%kF+W_o=W3>wr<~MnFE)QAcAStd=Jl-4
zvb5>P(}LUpef$20<ZB+uZNo&Ho0uIZ=aKuc2kYZ-R_Tj*fg5<vRzxs15F3aM#0K03
ZegP-|Z*l3MaiIVJ002ovPDHLkV1iDIq>2Cl

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_black/drawable-xhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/ic_settings_update_black/drawable-xhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..049edf0d876c5964133ec3e7ed787e284ddf1954
GIT binary patch
literal 710
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U~2GmaSW+o
zd^^oHThvjcP1u)(d$AyQAU7w+v@D&_Yi=$%e>DHGtQBbzV`I4(ub}D7WVTV{;F4~I
z8xbp3ENIfun)SR@Hsamf!t}|r-`sm${UEjMe9hd?XO6$SG2<+Y&jFn1pEA>9-6vKj
z=eS=`+_HVnf9t30U-<s&)GCL+QCh5>A-UHr{$l=@)iu-dIb)r6U-Y<XxT&&X%A5OA
zE6>)Ji1fCcop7``WO_yZU*lgg?#{XF9se|6`RaYIZQU1~q2c?yLhh;B?5y&B!;*TQ
z)|YMe-Fb^mrxZU6?qvTjeay0P+fg+(i&rMeXBTFBod3V+bqH6$Rlko#+h1wS|9aA<
zKhE`))#FQ%@eYYsU!77C+F7%*&VPmQg2O9%>&2J(-j-V>w=m>`VZETF-@b_GpZ^w|
z&yc<A^gAFuXPSo{M5Z%tU&QSh{_$e6y}Gv*^1|o-Y>w_*a+5(kV_od_{gK=MU2ERK
zvi=+Y?dKQm|DEm%zrFMNljxNe{-4$u&)?J?GRL`lC7bor>-M!dv%_lhGbb}^9jTeg
z{&i)aV0E30)t1P*lN=!jwH4P!%@s8{;c3?sX?}0p_4P*1Ii*SazHhnuYMD;?)5ACJ
z2Qj~0@?ULoYeSKjW5?STruuiM+AF_A=G;9eaL`?(>6GTwj8b)z*q;W+=U&^a&hYoY
zy^G?CJ3#_nLB8Q}#V_tZHhI<Zvii=Ga0`c^N3%WS{+51W*>9}Iaf{Qp-??F8bk@_U
ze=J_j$#gAIzvG}E@J@Y`-cR|SrQH7MakuvcYx~=n2^%otL=t>V((ikkB%aAm*bYpX
N44$rjF6*2UngDR^J5c}t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_black/drawable-xxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/ic_settings_update_black/drawable-xxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..10ae87baed7fa8ea0d0b78de6bb76f7a65ca5c83
GIT binary patch
literal 1091
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VE*gr;uuoF
z_;%Lm)xLo;$JduXs_L0?oaOp#BgYlH+3&fqxv;UF>Zxy-wBLcPt5aplB%=ckbF|Hu
zXbX2Ws`T?1d^n-J{`~fLXWy2bi>rRW`Mq8G{ojADE`N73d+q&OuQz|YmA<|<FM9T2
zwwwbLqXlo++NNeO9Jah3X&}7ppo#={{X^}Vw(t)!afk9Verg<M={feuD}v42LD)c6
ztx3({<I?H-I4cf4&wJ4*|KLPMg56s_M^=@{@M@tgQh5!x&M~@sF-Ogu{ZMI%V7#s6
ztPbuCf~PjzvON2&{oPmVhm0ZIXMg>)+qtb-oso0l4VTvA6GF@Omi3=lIrTw@;f4uD
zv1`Aom{tAJ+i9KjOa78;vc%uajF6(3-}X=JSr;E@Y%Gi5-R<bFGhe|kK`!-I(z}*v
z9ci_io`0+&7`+qOd|E#SxWp`*EW1GT;+2eJEIMgNb|+}-FxY-w(z&?tlsnT?t!s<d
znw9E*Nz^!6#8%C@&+*!A&lBO7_WXA0WQ*Rp?pyYP)cGMnYpWFXx8Ay9b<K6r-wnKJ
z&c^T9N}_#U9K9L2LRIPQ#tV|_XTNv5<U9UuE-n!GvME2{Se)C{6S>RxUzxDrU+LvP
zf9D<9<zd!hr2#bZU;6|%x0t&ZemuUVrg_<|z<0%Dqp9nkr+m$`JNaPp70zB;&%S`U
z)+I*fR|4gpX38^e{<5>x&GpOVr*~d$jdVTOsC2G6Wv}sxk2~r-P71}E?3%kUac!-W
zdgUUKonKs*>^<dqq5ELaaqDw-Tb^W34bPZ<e6NL4f6>)f$|Y|M-g?PbeHW6-*jseB
zdodf&id@!LPx)o{Uv;>zd-;nmGn0x3)8;iTE4Jr)6vgcP#<{fL=HC0|v7Ca}ObQE&
zCQo_!Hs|GI3uO<Z8v%2<DkrUJ>8M&IeQNrWKc<yl@{^`rw^P_6r1a~Q_dc~3YE$gg
z44ULTijJzTR6Zye;(mm2s_My!Th1-0;F`3;_Jggv<<-do6Rq=q%AeTD!RETfxXbv$
zi`6gwh3DN@ad~n!dfzWg#?;#fi%)%Zejm2Z>E2`mfls?F&pX{?y?Wi$K=qgF8=EJU
z)|al%QlGS6jH^?y^~<OI!nvou^l$!^n;_%U81_^3mGbi<);`BXfBUmid-e${y<qvv
zoX76NW^35nru0aCZpPxJci#o?V88xQQbg?RtcHDzUO#LyS~(|FybYHzOJJrH1(-4a
aXIOPj>GJ+*WzN7-fx*+&&t;ucLK6UgrSE?L

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_black/drawable-xxxhdpi/ic_settings_update_black.png b/app/src/main/res/drawable/ic_settings_update_black/drawable-xxxhdpi/ic_settings_update_black.png
new file mode 100755
index 0000000000000000000000000000000000000000..49ac8ea654e4f48096c13cdb32633705825c5981
GIT binary patch
literal 2029
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
T%FJM|zX7)&y<O^^!pMICySl3e

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_settings_update_white.xml b/app/src/main/res/drawable/ic_settings_update_white.xml
deleted file mode 100644
index 0feb270af..000000000
--- a/app/src/main/res/drawable/ic_settings_update_white.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
-</vector>

From c864b15c34524bdfe83eb6faf3c6d438b3a453a6 Mon Sep 17 00:00:00 2001
From: krtkush <kartikey92@gmail.com>
Date: Mon, 26 Nov 2018 01:18:33 +0530
Subject: [PATCH 29/29] Test code revert.

---
 .../main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
index 706fec186..af9b88ac1 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -225,6 +225,6 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
     public static boolean isGithubApk() {
 
-        return true;
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
     }
 }