fix(): Bionic Lib check and copy fix for upgraded installs (utkarshdalal#1472)

* fix(): Fix the issue where bionic lib wasn't being copied correctly when upgrading

* fix(): Fix calling signature and issues ensureBionicLib. Now need to figure out why it's not copying still.

* fix(): Popped in a quick check for ensureBionicLib for installIfNeededFuture

Author: phobos665

app/src/main/java/com/winlator/xenvironment/ImageFsInstaller.java

@@ -89,6 +89,19 @@ public static void installWineFromDownloads(final Context context) {
         }
     }
 
+    // Modern flavor ships an additional bionic preload shipped as a flat asset
+    // (src/modern/assets/) until it's folded into redirect.tzst. Copy it next to
+    // the tarball-extracted variant so BionicProgramLauncherComponent can find it
+    private static void ensureBionicLib(Context context, File imagefs) {
+        if (BuildConfig.MODERN_ANDROID) {
+            File wxDest = new File(imagefs, "usr/lib/libredirect-bionic-wx.so");
+            if (!wxDest.exists()) {
+                FileUtils.copy(context, "libredirect-bionic-wx.so", wxDest);
+                chmod(wxDest);
+            }
+        }
+    }
+
     private static Future<Boolean> installFromAssetsFuture(
             final Context context,
             AssetManager assetManager,
@@ -109,11 +122,13 @@ private static Future<Boolean> installFromAssetsFuture(
             clearRootDir(context, rootDir);
             ensureSharedHomeRoot(context, rootDir);
             ensureProtonVersionSymlink(context, rootDir, wineVersion);
+            ensureBionicLib(context, rootDir);
 
             final byte compressionRatio = 22;
             String imagefsFile = containerVariant.equals(Container.GLIBC) ? "imagefs_gamenative.txz" : "imagefs_bionic.txz";
             File downloaded = new File(imageFs.getFilesDir(), imagefsFile);
 
+            
             boolean success = false;
 
             if (Arrays.asList(context.getAssets().list("")).contains(imagefsFile) == true){
@@ -190,14 +205,7 @@ private static void installGuestLibs(Context ctx) {
         chmod(new File(imagefs, "usr/lib/libredirect.so"));
         chmod(new File(imagefs, "usr/lib/libredirect-bionic.so"));
 
-        // Modern flavor ships an additional bionic preload shipped as a flat asset
-        // (src/modern/assets/) until it's folded into redirect.tzst. Copy it next to
-        // the tarball-extracted variant so BionicProgramLauncherComponent can find it.
-        if (BuildConfig.MODERN_ANDROID) {
-            File wxDest = new File(imagefs, "usr/lib/libredirect-bionic-wx.so");
-            FileUtils.copy(ctx, "libredirect-bionic-wx.so", wxDest);
-            chmod(wxDest);
-        }
+        ensureBionicLib(ctx, imagefs);
 
         final String EXTRAS_TAR = "extras.tzst";          // ➊  add this to assets/
         // ➋  Unpack straight into imagefs, preserving relative paths.
@@ -237,6 +245,7 @@ public static Future<Boolean> installIfNeededFuture(final Context context, Asset
         } else {
             Log.d("ImageFsInstaller", "Image FS already valid and at latest version");
             return Executors.newSingleThreadExecutor().submit(() -> {
+                ensureBionicLib(context, imageFs.getRootDir());
                 return true;
             });
         }