ReVancedUpdater: MicroG RE -> ReVanced GmsCore

Signed-off-by: Leonardo Ledda <leonardoledda@gmail.com>
LeddaZ · Mar 28, 2024 · 7a611c8 · 7a611c8
1 parent db9a220
commit 7a611c8
Show file tree

Hide file tree

Showing 64 changed files with 173 additions and 166 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <queries>
         <package android:name="app.revanced.android.youtube" />
         <package android:name="app.revanced.android.apps.youtube.music" />
-        <package android:name="com.mgoogle.android.gms" />
+        <package android:name="app.revanced.android.gms" />
     </queries>
 
     <application

diff --git a/app/src/main/java/it/leddaz/revancedupdater/MainActivity.kt b/app/src/main/java/it/leddaz/revancedupdater/MainActivity.kt
@@ -147,8 +147,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     /**
-     * Detects if MicroG RE is installed.
-     * @return MicroG RE installation status
+     * Detects if ReVanced GmsCore is installed.
+     * @return ReVanced GmsCore installation status
      */
     private fun isMicroGInstalled(): Boolean {
         try {
@@ -161,7 +161,7 @@ class MainActivity : AppCompatActivity() {
 
     /**
      * Gets the installed and latest versions of YouTube ReVanced,
-     * ReVanced Music, MicroG RE and ReVanced Updater.
+     * ReVanced Music, ReVanced GmsCore and ReVanced Updater.
      * @property callback callback used to detect if the download was
      *                    successful
      */
@@ -203,7 +203,7 @@ class MainActivity : AppCompatActivity() {
             "https://raw.githubusercontent.com/LeddaZ/revanced-repo/main/updater.json"
         val updaterAPIUrl = "https://api.github.com/repos/LeddaZ/ReVancedUpdater/releases/latest"
         val updaterCommitUrl = "https://api.github.com/repos/LeddaZ/ReVancedUpdater/commits/master"
-        val microGAPIUrl = "https://api.github.com/repos/WSTxda/MicroG-RE/releases/latest"
+        val microGAPIUrl = "https://api.github.com/repos/ReVanced/GmsCore/releases/latest"
         var reVancedReply: ReVancedJSONObject
         var updaterReleaseReply: UpdaterReleaseJSONObject
         var updaterDebugReply: UpdaterDebugJSONObject
@@ -253,9 +253,8 @@ class MainActivity : AppCompatActivity() {
         val microGRequest = StringRequest(GET, microGAPIUrl, { response ->
             microGReply =
                 Gson().fromJson(response, object : TypeToken<MicroGJSONObject>() {}.type)
-            latestMicroGVersion = Version(microGReply.latestMicroGVersion)
-            microGDownloadUrl = "https://github.com/WSTxda/MicroG-RE/releases/download/" +
-                    latestMicroGVersion + "/MicroG_RE_" + latestMicroGVersion + ".apk"
+            latestMicroGVersion = Version(microGReply.latestMicroGVersion.substring(1))
+            microGDownloadUrl = microGReply.assets.firstOrNull()?.latestMicroGUrl.toString()
             callback.onSuccess()
         }, {})
 
@@ -321,7 +320,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     /**
-     * Downloads MicroG RE when the button is clicked.
+     * Downloads ReVanced GmsCore when the button is clicked.
      * @property view the view which contains the button.
      */
     fun downloadMicroG(view: View) {
@@ -377,7 +376,7 @@ class MainActivity : AppCompatActivity() {
                         getString(R.string.installed_app_version, APP_VERSION)
                 }
             } else if (packageName == MICROG_PACKAGE) {
-                installedVersion.version = pInfo.versionName.substring(0, 3)
+                installedVersion.version = pInfo.versionName
                 installedTextView.text =
                     getString(R.string.installed_app_version, installedVersion.version)
             } else {
@@ -426,7 +425,7 @@ class MainActivity : AppCompatActivity() {
                 updateStatusTextView.text = getString(R.string.update_available)
                 button.isEnabled = true
             } else if (installedVersion.compareTo(latestVersion) == 0) {
-                if (packageName.startsWith("app.revanced")) {
+                if (packageName != MICROG_PACKAGE) {
                     var latestHash = getLatestReVancedHash()
                     if (packageName == MUSIC_PACKAGE)
                         latestHash = getLatestReVancedMusicHash()

diff --git a/app/src/main/java/it/leddaz/revancedupdater/utils/json/MicroGJSONObject.kt b/app/src/main/java/it/leddaz/revancedupdater/utils/json/MicroGJSONObject.kt
@@ -4,5 +4,13 @@ import com.google.gson.annotations.SerializedName
 
 data class MicroGJSONObject(
     @SerializedName("tag_name")
-    val latestMicroGVersion: String
+    val latestMicroGVersion: String,
+
+    @SerializedName("assets")
+    val assets: List<Asset>,
+)
+
+data class Asset(
+    @SerializedName("browser_download_url")
+    val latestMicroGUrl: String
 )
diff --git a/app/src/main/java/it/leddaz/revancedupdater/utils/misc/CommonStuff.kt b/app/src/main/java/it/leddaz/revancedupdater/utils/misc/CommonStuff.kt
@@ -20,7 +20,7 @@ object CommonStuff {
     // Package names
     const val REVANCED_PACKAGE = "app.revanced.android.youtube"
     const val MUSIC_PACKAGE = "app.revanced.android.apps.youtube.music"
-    const val MICROG_PACKAGE = "com.mgoogle.android.gms"
+    const val MICROG_PACKAGE = "app.revanced.android.gms"
     const val UPDATER_PACKAGE = "it.leddaz.revancedupdater"
 
     /**

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
@@ -14,14 +14,14 @@
     <string name="bottom_bar_refresh">Refresh</string>
     <string name="none">none</string>
     <string name="music_download_button_description">Download ReVanced Music</string>
-    <string name="microg_download_button_description">Download MicroG RE</string>
+    <string name="microg_download_button_description">Download ReVanced GmsCore</string>
     <string name="updater_download_button_description">Download ReVanced Updater</string>
     <string name="invalid">invalid</string>
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -20,8 +20,8 @@
     <string name="invalid_version_detected">Invalid version detected. Uninstall existing apps.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="microg_dialog_title">MicroG RE not installed</string>
-    <string name="microg_dialog_text">MicroG RE is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
+    <string name="microg_dialog_title">ReVanced GmsCore not installed</string>
+    <string name="microg_dialog_text">ReVanced GmsCore is required to log in to your Google account on ReVanced apps. Do you want to install it now?</string>
     <string name="bottom_bar_about">About</string>
     <string name="about_dialog_title">About this app</string>
     <string name="download_button_text">Download</string>