Skip installer dialog when input same as installed app

Author: woesss

app/src/main/java/ru/woesss/j2me/installer/AppInstaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Yury Kharchenko
+ * Copyright 2020-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ public class AppInstaller {
 	static final int STATUS_NEW = 2;
 	static final int STATUS_UNMATCHED = 3;
 	static final int STATUS_SUCCESS = 4;
+	static final int STATUS_SAME = 5;
 
 	private final int id;
 	private final Application context;
@@ -374,7 +375,22 @@ private int checkDescriptor() {
 		}
 		appDirName = currentApp.getPath();
 		targetDir = new File(Config.getAppDir(), appDirName);
-		return newDesc.compareVersion(currentApp.getVersion());
+		int result = newDesc.compareVersion(currentApp.getVersion());
+		if (result == 0) {
+			if (srcJar != null && srcJar.exists()) {
+				File targetJar = new File(targetDir, Config.MIDLET_RES_FILE);
+				if (targetJar.exists() && targetJar.length() == srcJar.length()) {
+					try (FileInputStream one = new FileInputStream(srcJar);
+						 FileInputStream two = new FileInputStream(targetJar)) {
+						if (one.read() != two.read()) {
+							return STATUS_EQUAL;
+						}
+						return STATUS_SAME;
+					} catch (IOException ignored) {}
+				}
+			}
+		}
+		return result;
 	}
 
 	private void generatePathName(String name) {

app/src/main/java/ru/woesss/j2me/installer/InstallerDialog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Yury Kharchenko
+ * Copyright 2020-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -240,20 +240,18 @@ private void onProgress(@NonNull Integer status) {
 		Descriptor nd = installer.getNewDescriptor();
 		SpannableStringBuilder message;
 		switch (status) {
-			case AppInstaller.STATUS_NEW:
+			case AppInstaller.STATUS_NEW -> {
 				if (installer.getJar() != null) {
 					convert();
 					return;
 				}
 				message = nd.getInfo(requireActivity());
-				break;
-			case AppInstaller.STATUS_OLDEST:
-				message = new SpannableStringBuilder(getString(
-						R.string.reinstall_older,
-						nd.getVersion(),
-						installer.getCurrentVersion()));
-				break;
-			case AppInstaller.STATUS_EQUAL:
+			}
+			case AppInstaller.STATUS_OLDEST -> message = new SpannableStringBuilder(getString(
+					R.string.reinstall_older,
+					nd.getVersion(),
+					installer.getCurrentVersion()));
+			case AppInstaller.STATUS_EQUAL -> {
 				message = new SpannableStringBuilder(getString(R.string.reinstall));
 				AppItem app = installer.getExistsApp();
 				btnRun.setVisibility(View.VISIBLE);
@@ -263,20 +261,26 @@ private void onProgress(@NonNull Integer status) {
 					Config.startApp(v.getContext(), app.getTitle(), app.getPathExt(), false);
 					dismiss();
 				});
-				break;
-			case AppInstaller.STATUS_NEWEST:
-				message = new SpannableStringBuilder(getString(
-						R.string.reinstall_newest,
-						nd.getVersion(),
-						installer.getCurrentVersion()));
-				break;
-			case AppInstaller.STATUS_UNMATCHED:
+			}
+			case AppInstaller.STATUS_NEWEST -> message = new SpannableStringBuilder(getString(
+					R.string.reinstall_newest,
+					nd.getVersion(),
+					installer.getCurrentVersion()));
+			case AppInstaller.STATUS_UNMATCHED -> {
 				SpannableStringBuilder info = installer.getManifest().getInfo(requireActivity());
 				info.append(getString(R.string.install_jar_non_matched_jad));
 				alertConfirm(info, v -> installApp(installer.getJar(), null));
 				return;
-			default:
-				throw new IllegalStateException("Unexpected value: " + status);
+			}
+			case AppInstaller.STATUS_SAME -> {
+				installer.clearCache();
+				installer.deleteTemp();
+				AppItem app = installer.getExistsApp();
+				Config.startApp(getContext(), app.getTitle(), app.getPathExt(), false);
+				dismiss();
+				return;
+			}
+			default -> throw new IllegalStateException("Unexpected value: " + status);
 		}
 		if (installer.getJar() == null) {
 			message.append('\n').append(getString(R.string.warn_install_from_net));

app/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
     <string name="_MINUS_ONE" translatable="false">-1</string>
     <string name="about">About</string>
     <string name="about_4pda" translatable="false">&lt;BR>4PDA: &lt;a href="http://4pda.ru/forum/index.php?showtopic=824201">4pda.ru/forum/index.php?showtopic=824201&lt;/a></string>
-    <string name="about_copyright" translatable="false">\n\nCopyright 2020-2023 Yury Kharchenko</string>
+    <string name="about_copyright" translatable="false">\n\nCopyright 2020-2024 Yury Kharchenko</string>
     <string name="about_crowdin" translatable="false">&lt;BR>Crowdin(translation): &lt;a href="https://crowdin.com/project/j2me-loader">crowdin.com/project/j2me-loader&lt;/a></string>
     <string name="about_email" translatable="false">\n\nEmail: <a href="mailto:j2me.forever@gmail.com">j2me.forever@gmail.com</a>\n</string>
     <string name="about_github" translatable="false">\nGithub: <a href="https://github.com/woesss/JL-Mod">woesss/JL-Mod</a>\n</string>