Fix merging some split APKs with no DPI like SoundCloud

AbdurazaaqMohammed · Aug 21, 2024 · 983f976 · 983f976
1 parent 55274a6
commit 983f976
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
         minSdk = 4
         targetSdk = 35
         versionCode = 29
-        versionName = "1.6.5.5"
+        versionName = "1.6.5.6"
         multiDexEnabled = true
     }
 

diff --git a/app/src/main/java/com/reandroid/apk/ApkBundle.java b/app/src/main/java/com/reandroid/apk/ApkBundle.java
@@ -209,7 +209,7 @@ public void loadApkDirectory(File dir, boolean recursive, Context context) throw
                 break;
             }
         }
-        if(!hasDpi) throw new MismatchedSplitsException("Error: All DPI/resource splits selected have a mismatched version code.");
+        if(!hasDpi && !mismatchedDpis.isEmpty()) throw new MismatchedSplitsException("Error: All DPI/resource splits selected have a mismatched version code.");
         String s = mismatchedLangs.toString();
         if(!TextUtils.isEmpty(s)) {
             final CountDownLatch latch = new CountDownLatch(1);

diff --git a/app/src/main/java/com/reandroid/apkeditor/merge/Merger.java b/app/src/main/java/com/reandroid/apkeditor/merge/Merger.java
@@ -19,7 +19,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.os.Build;
 
 import com.abdurazaaqmohammed.AntiSplit.R;
 import com.abdurazaaqmohammed.AntiSplit.main.DeviceSpecsUtil;
@@ -85,7 +84,8 @@ private static void extractAndLoad(Uri in, File cacheDir, Context context, List<
                     logMessage(MainActivity.rss.getString(R.string.skipping) + name + MainActivity.rss.getString(R.string.not_apk));
             }
             bundle.loadApkDirectory(cacheDir, false, context);
-        } catch (MismatchedSplitsException ignored) {
+        } catch (MismatchedSplitsException m) {
+            throw new RuntimeException(m);
         } catch (Exception e) {
             // If the above failed it probably did not copy any files
             // so might as well do it this way instead of trying unreliable methods to see if we need to do this