From 0212b9943b1e010c3dd530674ea87b6db1a058a8 Mon Sep 17 00:00:00 2001
From: int3debug <gh.ditch236@passinbox.com>
Date: Wed, 20 Mar 2024 00:49:16 +0100
Subject: [PATCH] disable update popup until origin_hash changes - renamed
 commit_hash to origin_hash - added current_hash for later use

---
 app/build.gradle.kts                                          | 3 ++-
 .../lagradost/cloudstream3/ui/settings/SettingsFragment.kt    | 2 +-
 .../java/com/lagradost/cloudstream3/utils/InAppUpdater.kt     | 2 +-
 app/src/main/res/layout/main_settings.xml                     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c2ba2907..372a9f8d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -63,7 +63,8 @@ android {
         versionName = "4.3.2"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+        resValue("string", "origin_hash", "git rev-parse --short origin/HEAD".execute() ?: "")
+        resValue("string", "current_hash", "git rev-parse --short HEAD".execute() ?: "")
         resValue("bool", "is_prerelease", "false")
 
         // Reads local.properties
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index caff5df6..0da3a92e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -178,7 +178,7 @@ class SettingsFragment : Fragment() {
         }
 
         val appVersion = getString(R.string.app_version)
-        val commitInfo = getString(R.string.commit_hash)
+        val commitInfo = getString(R.string.origin_hash)
 
         binding?.appVersionInfo?.setOnLongClickListener{
             clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index d9a31b4e..115c6c5f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -180,7 +180,7 @@ class InAppUpdater {
             Log.d(LOG_TAG, "Fetched GitHub tag: ${tagResponse.github_object.sha.take(7)}")
 
             val shouldUpdate =
-                (getString(R.string.commit_hash)
+                (getString(R.string.origin_hash)
                     .trim { c -> c.isWhitespace() }
                     .take(7)
                         !=
diff --git a/app/src/main/res/layout/main_settings.xml b/app/src/main/res/layout/main_settings.xml
index 53db7e47..a500e64e 100644
--- a/app/src/main/res/layout/main_settings.xml
+++ b/app/src/main/res/layout/main_settings.xml
@@ -129,12 +129,12 @@
                     android:textColor="?attr/textColor" />
 
                 <TextView
-                    android:id="@+id/commit_hash"
+                    android:id="@+id/origin_hash"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:padding="10dp"
-                    android:text="@string/commit_hash"
+                    android:text="@string/origin_hash"
                     android:textColor="?attr/textColor" />
             </LinearLayout>