From e5fd24b0d19d35d56efb15219277821b4afd00d2 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Tue, 26 Oct 2021 20:25:09 +0200
Subject: [PATCH] Make naming great again

When we build APKs in PRs it's also a GITHUB_APK...
---
 .../java/org/schabi/newpipe/CheckForNewAppVersion.java   | 9 +++++----
 .../schabi/newpipe/settings/MainSettingsFragment.java    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
index 76cd2988a..173a24ab7 100644
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -46,7 +46,8 @@ public final class CheckForNewAppVersion extends IntentService {
     private static final boolean DEBUG = MainActivity.DEBUG;
     private static final String TAG = CheckForNewAppVersion.class.getSimpleName();
 
-    private static final String GITHUB_APK_SHA1
+    // Public key of the certificate that is used in NewPipe release versions
+    private static final String RELEASE_CERT_PUBLIC_KEY_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 NEWPIPE_API_URL = "https://newpipe.net/api/data.json";
 
@@ -156,8 +157,8 @@ public final class CheckForNewAppVersion extends IntentService {
         }
     }
 
-    public static boolean isGithubApk(@NonNull final App app) {
-        return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1);
+    public static boolean isReleaseApk(@NonNull final App app) {
+        return getCertificateSHA1Fingerprint(app).equals(RELEASE_CERT_PUBLIC_KEY_SHA1);
     }
 
     private void checkNewVersion() throws IOException, ReCaptchaException {
@@ -167,7 +168,7 @@ public final class CheckForNewAppVersion extends IntentService {
         final NewVersionManager manager = new NewVersionManager();
 
         // Check if the current apk is a github one or not.
-        if (!isGithubApk(app)) {
+        if (!isReleaseApk(app)) {
             return;
         }
 
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 4d847056e..12599b828 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
@@ -16,7 +16,7 @@ public class MainSettingsFragment extends BasePreferenceFragment {
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
         addPreferencesFromResource(R.xml.main_settings);
 
-        if (!CheckForNewAppVersion.isGithubApk(App.getApp())) {
+        if (!CheckForNewAppVersion.isReleaseApk(App.getApp())) {
             final Preference update
                     = findPreference(getString(R.string.update_pref_screen_key));
             getPreferenceScreen().removePreference(update);