feat: Improve updater version comparison and API compliance

Author: WSTxda

build.gradle

@@ -83,7 +83,7 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.13
+    ext.appVersionName = 5.13 // Used to compare with GitHub release tag to get updates
     ext.appVersionCode = 253850000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName + " GMS-" + ext.baseVersion

play-services-core/microg-ui-tools/build.gradle

@@ -26,6 +26,7 @@ android {
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 
+        buildConfigField "String", "APP_VERSION_NAME", "\"${rootProject.ext.appVersionName}\""
         buildConfigField "String", "GMS_APPLICATION_NAMESPACE", "\"$applicationNamespace\""
     }
 

play-services-core/microg-ui-tools/src/main/java/org/microg/tools/updater/UpdateChecker.java

@@ -1,10 +1,12 @@
 package org.microg.tools.updater;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -15,6 +17,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.microg.tools.ui.BuildConfig;
 import org.microg.tools.ui.R;
 
 import java.io.IOException;
@@ -27,32 +30,35 @@
 
 public class UpdateChecker {
 
+    private static final String TAG = "UpdateChecker";
     private static final String GITHUB_API_URL = "https://api.github.com/repos/MorpheApp/MicroG-RE/releases/latest";
     private static final String GITHUB_RELEASE_LINK = "https://github.com/MorpheApp/MicroG-RE/releases/latest";
 
+    private static final OkHttpClient client = new OkHttpClient.Builder().retryOnConnectionFailure(true).build();
+
     private final WeakReference<Context> contextRef;
-    private final OkHttpClient client;
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
 
     public UpdateChecker(Context context) {
         this.contextRef = new WeakReference<>(context);
-        this.client = new OkHttpClient.Builder().retryOnConnectionFailure(true).build();
     }
 
     public void checkForUpdates(View view, Runnable onComplete) {
-        CompletableFuture.supplyAsync(this::fetchLatestVersion).thenAccept(latestVersion -> runOnMainThread(() -> {
+        CompletableFuture.supplyAsync(this::fetchLatestVersion).thenAccept(latestVersion -> mainHandler.post(() -> {
             handleLatestVersion(latestVersion, view);
-            onComplete.run();
+            if (onComplete != null) onComplete.run();
         })).exceptionally(throwable -> {
-            runOnMainThread(() -> {
+            mainHandler.post(() -> {
                 handleError(throwable, view);
-                onComplete.run();
+                if (onComplete != null) onComplete.run();
             });
             return null;
         });
     }
 
     private String fetchLatestVersion() {
-        Request request = new Request.Builder().url(GITHUB_API_URL).build();
+        Request request = new Request.Builder().url(GITHUB_API_URL).header("User-Agent", "MicroG-RE-Updater").build();
+
         try (Response response = client.newCall(request).execute()) {
             if (response.isSuccessful()) {
                 return parseLatestVersion(response.body().string());
@@ -67,35 +73,60 @@ private String fetchLatestVersion() {
     private String parseLatestVersion(String jsonData) {
         try {
             JSONObject jsonObject = new JSONObject(jsonData);
-            return jsonObject.optString("tag_name", "");
+            return jsonObject.optString("tag_name", "").replace("v", "").trim();
         } catch (JSONException e) {
             throw new RuntimeException("Error processing JSON", e);
         }
     }
 
     private void handleLatestVersion(String latestVersion, View view) {
         Context context = contextRef.get();
-        if (context == null || view == null) return;
+        if (context == null || view == null || latestVersion.isEmpty()) return;
+
+
+        if (context instanceof Activity && ((Activity) context).isFinishing()) return;
 
-        String appVersion = context.getString(R.string.github_tag_version);
+        String appVersion = BuildConfig.APP_VERSION_NAME.replace("v", "").trim();
 
-        if (appVersion.compareTo(latestVersion) < 0) {
-            showSnackbarWithAction(view, context.getString(R.string.update_available), context.getString(R.string.download_button), v -> openGitHubReleaseLink(context));
+        if (isVersionNewer(appVersion, latestVersion)) {
+            showSnackbarWithAction(view, context.getString(R.string.update_available) + " (" + latestVersion + ")", context.getString(R.string.download_button), v -> openGitHubReleaseLink(context));
         } else {
             showSnackbar(view, context.getString(R.string.no_update_available));
         }
     }
 
+    private boolean isVersionNewer(String current, String latest) {
+        try {
+            String[] currParts = current.split("\\.");
+            String[] latParts = latest.split("\\.");
+            int length = Math.max(currParts.length, latParts.length);
+
+            for (int i = 0; i < length; i++) {
+                int currV = i < currParts.length ? Integer.parseInt(currParts[i].replaceAll("[^0-9]", "")) : 0;
+                int latV = i < latParts.length ? Integer.parseInt(latParts[i].replaceAll("[^0-9]", "")) : 0;
+
+                if (latV > currV) return true;
+                if (currV > latV) return false;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error comparing versions", e);
+            return latest.compareTo(current) > 0;
+        }
+        return false;
+    }
+
     private void handleError(Throwable throwable, View view) {
         Context context = contextRef.get();
         if (context == null || view == null) return;
 
-        String errorMessage = throwable.getMessage() != null && throwable.getMessage().toLowerCase().contains("connection") ? context.getString(R.string.error_connection) + " " + throwable.getMessage() : context.getString(R.string.error_others) + " " + throwable.getMessage();
-        showSnackbar(view, errorMessage);
+        String message = throwable.getCause() != null ? throwable.getCause().getMessage() : throwable.getMessage();
+        String errorText = (message != null && message.contains("connection")) ? context.getString(R.string.error_connection) : context.getString(R.string.error_others);
+
+        showSnackbar(view, errorText);
     }
 
     private void showSnackbar(View view, String message) {
-        Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
+        Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_SHORT);
         configureSnackbar(snackbar);
         snackbar.show();
     }
@@ -110,18 +141,19 @@ private void configureSnackbar(Snackbar snackbar) {
         ViewCompat.setOnApplyWindowInsetsListener(snackbar.getView(), (v, insets) -> {
             int bottomPadding = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
             ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-            params.bottomMargin = bottomPadding;
+            params.bottomMargin = bottomPadding + 20;
             v.setLayoutParams(params);
             return insets;
         });
     }
 
     private void openGitHubReleaseLink(Context context) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_RELEASE_LINK));
-        context.startActivity(intent);
-    }
-
-    private void runOnMainThread(Runnable action) {
-        new Handler(Looper.getMainLooper()).post(action);
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_RELEASE_LINK));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        } catch (Exception e) {
+            Log.e(TAG, "Error opening release link", e);
+        }
     }
 }

play-services-core/microg-ui-tools/src/main/res/values/strings.xml

@@ -16,10 +16,6 @@
 
 <resources>
 
-    <!-- UpdateChecker Tag Controller-->
-
-    <string name="github_tag_version" translatable="false">5.13</string>
-
     <!--Updater-->
 
     <string name="check_updates">Check updates</string>