From aa857165c06d08d77970d73f955c8a9e7c40f928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 10:08:28 +0000
Subject: [PATCH 1/3] Bump androidx.window:window from 1.4.0 to 1.5.0

Bumps androidx.window:window from 1.4.0 to 1.5.0.

---
updated-dependencies:
- dependency-name: androidx.window:window
  dependency-version: 1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index bf098b6..058fe62 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,7 +90,7 @@ dependencies {
     implementation 'com.google.guava:guava:33.5.0-jre'
     implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'com.squareup.okhttp3:okhttp:5.1.0'
-    implementation "androidx.window:window:1.4.0"
+    implementation "androidx.window:window:1.5.0"
     implementation "commons-io:commons-io:2.20.0"
     implementation 'org.zeroturnaround:zt-zip:1.17'
     implementation 'com.airbnb.android:lottie:6.6.9'

From 0e90e7fb944a98f7c0b1ca54031e48e6ad678484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 10:22:47 +0000
Subject: [PATCH 2/3] Bump com.google.android.material:material

Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.14.0-alpha04 to 1.14.0-alpha05.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.14.0-alpha04...1.14.0-alpha05)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-version: 1.14.0-alpha05
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index bf098b6..04595d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'com.google.android.material:material:1.14.0-alpha04'
+    implementation 'com.google.android.material:material:1.14.0-alpha05'
     implementation "androidx.annotation:annotation:1.9.1"
     implementation "androidx.core:core:1.17.0"
     implementation "androidx.drawerlayout:drawerlayout:1.2.0"

From cb85f562fabc5adf5d9785b7b488ba67a5917fa0 Mon Sep 17 00:00:00 2001
From: An Bui <91354810+AnBui2004@users.noreply.github.com>
Date: Sun, 5 Oct 2025 19:52:05 +0700
Subject: [PATCH 3/3] v2.9.5.12-3dfx

- Improved settings.
- Changed shared file import folder location.
- Fixed VM ID in VM creator sometimes not refreshing.
- Added detection of shared folders that exceed size limit.
- Improved file import on home screen.
- Now when clicking Rom store icon in right corner in file importer or selecting architecture, it will go back to home screen and to Rom store.
- Added note about using X11 instead of VNC in VNC settings when X11 is in use.
- Added opening home folder in other file browser.
- Some changes to drawer.
---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |  10 +
 .../com/vectras/qemu/MainSettingsManager.java | 180 +++---
 .../main/java/com/vectras/vm/AppConfig.java   |   1 +
 .../com/vectras/vm/CustomRomActivity.java     |   7 +-
 .../Fragment/CreateImageDialogFragment.java   |   2 +-
 .../java/com/vectras/vm/SetArchActivity.java  |   5 +-
 .../com/vectras/vm/home/HomeActivity.java     | 526 +++++++-----------
 .../com/vectras/vm/home/core/HomeStartVM.java |  20 +
 .../vm/settings/VNCSettingsActivity.java      |  16 +-
 .../com/vectras/vm/utils/DialogUtils.java     |  31 +-
 .../java/com/vectras/vm/utils/FileUtils.java  |  78 ++-
 .../drawable-xhdpi/patreon_outline_225.png    | Bin 0 -> 9339 bytes
 app/src/main/res/drawable/help_24px.xml       |  11 +
 app/src/main/res/drawable/overview_24px.xml   |  10 +
 .../main/res/layout/activity_vnc_settings.xml |  29 +
 app/src/main/res/menu/home_drawer_menu.xml    |  25 +-
 app/src/main/res/values/strings.xml           |  19 +-
 app/src/main/res/xml/file_provider_paths.xml  |   5 +
 web/data/UpdateConfig.json                    |   8 +-
 20 files changed, 520 insertions(+), 465 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/patreon_outline_225.png
 create mode 100644 app/src/main/res/drawable/help_24px.xml
 create mode 100644 app/src/main/res/drawable/overview_24px.xml
 create mode 100644 app/src/main/res/xml/file_provider_paths.xml

diff --git a/app/build.gradle b/app/build.gradle
index a287fa0..acd5413 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk minApi
         targetSdk targetApi
         versionCode 21
-        versionName "v2.9.5.11-3dfx"
+        versionName "v2.9.5.12-3dfx"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a72bb0e..39cbb44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -269,6 +269,16 @@
                 <action android:name="com.vectras.vm.x11.CHANGE_PREFERENCE" />
             </intent-filter>
         </receiver>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
         <!--
  This (or rather, value 2.1 or higher) is needed to make the Samsung Galaxy S8 mark the
         app with "This app is optimized to run in full screen."
diff --git a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
index 83c2d6d..3dde485 100644
--- a/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
+++ b/app/src/main/java/com/vectras/qemu/MainSettingsManager.java
@@ -10,8 +10,11 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.preference.PreferenceManager;
+import android.util.Log;
 
+import androidx.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
@@ -28,13 +31,19 @@ import com.vectras.vm.SplashActivity;
 import com.vectras.vm.VectrasApp;
 
 import java.util.Locale;
+import java.util.Objects;
 
 public class MainSettingsManager extends AppCompatActivity
         implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+
+    public static final String TAG = "MainSettingsManager";
+
     public static MainSettingsManager activity;
 
     private static Handler mHandler;
     public static SharedPreferences sp;
+    public static int goToXML = -1;
+    public static boolean isAllowFirstChangeSubtitle = true;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +56,6 @@ public class MainSettingsManager extends AppCompatActivity
         sp = PreferenceManager.getDefaultSharedPreferences(activity);
 
         PreferenceFragmentCompat preference = new MainPreferencesFragment();
-        Intent intent = getIntent();
 
         // add preference settings
         getSupportFragmentManager().beginTransaction()
@@ -55,18 +63,33 @@ public class MainSettingsManager extends AppCompatActivity
                 .commit();
 
         // toolbar
-        Toolbar mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar mToolbar = findViewById(R.id.toolbar);
         setSupportActionBar(mToolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+
+        CollapsingToolbarLayout collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
+
+        if (getIntent().hasExtra("goto")) {
+            isAllowFirstChangeSubtitle = false;
+            if (Objects.equals(getIntent().getStringExtra("goto"), "qemu")) {
+                goToXML = R.xml.qemu;
+                collapsingToolbarLayout.setSubtitle(getString(R.string.qemu));
+            }
+        }
     }
 
     @Override
-    public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
+    public boolean onPreferenceStartFragment(@NonNull PreferenceFragmentCompat caller, Preference pref) {
         // Instantiate the new Fragment
         final Bundle bundle = pref.getExtras();
-        final Fragment fragment = Fragment.instantiate(this, pref.getFragment(), bundle);
 
-        fragment.setTargetFragment(caller, 0);
+        assert pref.getFragment() != null;
+        Fragment fragment = getSupportFragmentManager()
+                .getFragmentFactory()
+                .instantiate(getClassLoader(), pref.getFragment());
+        fragment.setArguments(bundle);
+
+//        fragment.setTargetFragment(caller, 0);
 
         // Replace the existing Fragment with the new Fragment
         getSupportFragmentManager().beginTransaction()
@@ -94,11 +117,13 @@ public class MainSettingsManager extends AppCompatActivity
         @Override
         public void onResume() {
             super.onResume();
-            CollapsingToolbarLayout collapsingToolbarLayout =
-                    requireActivity().findViewById(R.id.collapsingToolbarLayout);
+            if (MainSettingsManager.isAllowFirstChangeSubtitle) {
+                CollapsingToolbarLayout collapsingToolbarLayout =
+                        requireActivity().findViewById(R.id.collapsingToolbarLayout);
 
-            if (collapsingToolbarLayout != null) {
-                collapsingToolbarLayout.setSubtitle(getString(R.string.general));
+                if (collapsingToolbarLayout != null) {
+                    collapsingToolbarLayout.setSubtitle(getString(R.string.general));
+                }
             }
         }
 
@@ -112,14 +137,12 @@ public class MainSettingsManager extends AppCompatActivity
         @Override
         public void onCreatePreferences(Bundle bundle, String root_key) {
             // Load the Preferences from the XML file
-            setPreferencesFromResource(R.xml.headers_preference, root_key);
+            setPreferencesFromResource(MainSettingsManager.goToXML == -1 ? R.xml.headers_preference : MainSettingsManager.goToXML, root_key);
+            MainSettingsManager.goToXML = -1;
         }
 
         @Override
-        public boolean onPreferenceChange(Preference pref, Object newValue) {
-            if (pref.getKey().equals("app")) {
-
-            }
+        public boolean onPreferenceChange(@NonNull Preference pref, Object newValue) {
             return true;
         }
 
@@ -162,26 +185,26 @@ public class MainSettingsManager extends AppCompatActivity
                 languagePref.setOnPreferenceChangeListener(this);
             }
 
-            SwitchPreferenceCompat switchPreferenceCompat = findPreference("updateVersionPrompt");
-            assert switchPreferenceCompat != null;
-            SwitchPreferenceCompat switchJoinBetaChannel = findPreference("checkforupdatesfromthebetachannel");
-            assert switchJoinBetaChannel != null;
-
-            if (!switchPreferenceCompat.isChecked()) {
-                switchJoinBetaChannel.setEnabled(false);
-            }
-
-            switchPreferenceCompat.setOnPreferenceChangeListener((preference, newValue) -> {
-                if (!(Boolean) newValue) {
-                    if (switchJoinBetaChannel.isEnabled())
-                        switchJoinBetaChannel.setEnabled(false);
-                } else {
-                    if (!switchJoinBetaChannel.isEnabled())
-                        switchJoinBetaChannel.setEnabled(true);
-
-                }
-                return true;
-            });
+//            SwitchPreferenceCompat switchPreferenceCompat = findPreference("updateVersionPrompt");
+//            assert switchPreferenceCompat != null;
+//            SwitchPreferenceCompat switchJoinBetaChannel = findPreference("checkforupdatesfromthebetachannel");
+//            assert switchJoinBetaChannel != null;
+//
+//            if (!switchPreferenceCompat.isChecked()) {
+//                switchJoinBetaChannel.setEnabled(false);
+//            }
+//
+//            switchPreferenceCompat.setOnPreferenceChangeListener((preference, newValue) -> {
+//                if (!(Boolean) newValue) {
+//                    if (switchJoinBetaChannel.isEnabled())
+//                        switchJoinBetaChannel.setEnabled(false);
+//                } else {
+//                    if (!switchJoinBetaChannel.isEnabled())
+//                        switchJoinBetaChannel.setEnabled(true);
+//
+//                }
+//                return true;
+//            });
 
         }
 
@@ -268,7 +291,7 @@ public class MainSettingsManager extends AppCompatActivity
         }
 
         @Override
-        public boolean onPreferenceChange(Preference pref, Object newValue) {
+        public boolean onPreferenceChange(@NonNull Preference pref, Object newValue) {
             return true;
         }
 
@@ -284,9 +307,9 @@ public class MainSettingsManager extends AppCompatActivity
 
             //Preference prefIfType = findPreference("ifType");
             //if (getArch(activity).equals("ARM64"))
-                //if (prefIfType != null) {
-                    //prefIfType.setVisible(false);
-                //}
+            //if (prefIfType != null) {
+            //prefIfType.setVisible(false);
+            //}
 
             Preference pref = findPreference("vmArch");
             if (pref != null) {
@@ -359,12 +382,9 @@ public class MainSettingsManager extends AppCompatActivity
         }
 
         private void onArch() {
-            mHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    activity.finish();
-                    startActivity(new Intent(activity, SplashActivity.class));
-                }
+            mHandler.postDelayed(() -> {
+                activity.finish();
+                startActivity(new Intent(activity, SplashActivity.class));
             }, 300);
         }
 
@@ -401,7 +421,7 @@ public class MainSettingsManager extends AppCompatActivity
         }
 
         @Override
-        public boolean onPreferenceChange(Preference pref, Object newValue) {
+        public boolean onPreferenceChange(@NonNull Preference pref, Object newValue) {
             return true;
         }
 
@@ -442,10 +462,7 @@ public class MainSettingsManager extends AppCompatActivity
         }
 
         @Override
-        public boolean onPreferenceChange(Preference pref, Object newValue) {
-            if (pref.getKey().equals("app")) {
-
-            }
+        public boolean onPreferenceChange(@NonNull Preference pref, Object newValue) {
             return true;
         }
 
@@ -490,9 +507,8 @@ public class MainSettingsManager extends AppCompatActivity
     public static int getOrientationSetting(Activity activity) {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-        int orientation = prefs.getInt("orientation", 0);
         // UIUtils.log("Getting First time: " + firstTime);
-        return orientation;
+        return prefs.getInt("orientation", 0);
     }
 
     public static void setOrientationSetting(Activity activity, int orientation) {
@@ -571,42 +587,39 @@ public class MainSettingsManager extends AppCompatActivity
 
     public static String getLastDir(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String imagesDir = prefs.getString("lastDir", null);
-        return imagesDir;
+        return prefs.getString("lastDir", null);
     }
 
     public static void setLastDir(Context context, String imagesPath) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString("lastDir", imagesPath);
-        edit.commit();
+        edit.apply();
     }
 
     public static String getImagesDir(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String imagesDir = prefs.getString("imagesDir", null);
-        return imagesDir;
+        return prefs.getString("imagesDir", null);
     }
 
     public static void setImagesDir(Context context, String imagesPath) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString("imagesDir", imagesPath);
-        edit.commit();
+        edit.apply();
     }
 
 
     public static String getExportDir(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String imagesDir = prefs.getString("exportDir", null);
-        return imagesDir;
+        return prefs.getString("exportDir", null);
     }
 
     public static void setExportDir(Context context, String imagesPath) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString("exportDir", imagesPath);
-        edit.commit();
+        edit.apply();
     }
 
 
@@ -626,28 +639,26 @@ public class MainSettingsManager extends AppCompatActivity
 
     public static int getExitCode(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int exitCode = prefs.getInt("exitCode", 1);
-        return exitCode;
+        return prefs.getInt("exitCode", 1);
     }
 
     public static void setExitCode(Context context, int exitCode) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putInt("exitCode", exitCode);
-        edit.commit();
+        edit.apply();
     }
 
     public static String getControlMode(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String controlMode = prefs.getString("controlMode", "D");
-        return controlMode;
+        return prefs.getString("controlMode", "D");
     }
 
     public static void setControlMode(Context context, String controlMode) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString("controlMode", controlMode);
-        edit.commit();
+        edit.apply();
     }
 
 
@@ -655,7 +666,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("modeNight", nightMode);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getModeNight(Context context) {
@@ -812,29 +823,30 @@ public class MainSettingsManager extends AppCompatActivity
         PackageInfo pInfo = null;
 
         try {
-            pInfo = activity.getPackageManager().getPackageInfo(activity.getClass().getPackage().getName(),
+            pInfo = activity.getPackageManager().getPackageInfo(Objects.requireNonNull(activity.getClass().getPackage()).getName(),
                     PackageManager.GET_META_DATA);
         } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+            Log.e(TAG, "isFirstLaunch", e);
         }
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-        boolean firstTime = prefs.getBoolean("firstTime" + pInfo.versionName, true);
-        return firstTime;
+        assert pInfo != null;
+        return prefs.getBoolean("firstTime" + pInfo.versionName, true);
     }
 
     public static void setFirstLaunch(Activity activity) {
         PackageInfo pInfo = null;
 
         try {
-            pInfo = activity.getPackageManager().getPackageInfo(activity.getClass().getPackage().getName(),
+            pInfo = activity.getPackageManager().getPackageInfo(Objects.requireNonNull(activity.getClass().getPackage()).getName(),
                     PackageManager.GET_META_DATA);
         } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+            Log.e(TAG, "setFirstLaunch", e);
         }
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
         SharedPreferences.Editor edit = prefs.edit();
+        assert pInfo != null;
         edit.putBoolean("firstTime" + pInfo.versionName, false);
-        edit.commit();
+        edit.apply();
     }
 
 
@@ -870,7 +882,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("setUpWithManualSetupBefore", _boolean);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getsetUpWithManualSetupBefore(Context context) {
@@ -882,7 +894,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putInt("SelectedMirror", _int);
-        edit.commit();
+        edit.apply();
     }
 
     public static int getSelectedMirror(Context context) {
@@ -894,7 +906,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("dontShowAgainJoinBetaUpdateChannelDialog", _boolean);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getDontShowAgainJoinBetaUpdateChannelDialog(Context context) {
@@ -906,7 +918,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("useDefaultBios", _boolean);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getuseDefaultBios(Context context) {
@@ -918,7 +930,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("useUEFI", _boolean);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getuseUEFI(Context context) {
@@ -930,7 +942,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString("skipVersion", version);
-        edit.commit();
+        edit.apply();
     }
 
     public static String getSkipVersion(Context context) {
@@ -942,7 +954,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putInt("vncScaleMode", mode);
-        edit.commit();
+        edit.apply();
     }
 
     public static int getVNCScaleMode(Context context) {
@@ -954,7 +966,7 @@ public class MainSettingsManager extends AppCompatActivity
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putBoolean("forceRefeshVNCDisplay", _boolean);
-        edit.commit();
+        edit.apply();
     }
 
     public static Boolean getForceRefeshVNCDisplay(Context context) {
diff --git a/app/src/main/java/com/vectras/vm/AppConfig.java b/app/src/main/java/com/vectras/vm/AppConfig.java
index 963e365..03a2a60 100644
--- a/app/src/main/java/com/vectras/vm/AppConfig.java
+++ b/app/src/main/java/com/vectras/vm/AppConfig.java
@@ -73,6 +73,7 @@ public class AppConfig {
     public static String downloadsFolder = maindirpath + "Downloads/";
     public static String romsdatajson = maindirpath + "roms-data.json";
     public static String vmFolder = maindirpath + "roms/";
+    public static String importedDriveFolder = maindirpath + "drive/";
     public static String pendingCommand = "";
 
     public static String neededPkgs = "aria2 tar dwm xfce4-terminal libslirp libslirp-dev pulseaudio-dev glib-dev pixman-dev zlib-dev spice-dev" +
diff --git a/app/src/main/java/com/vectras/vm/CustomRomActivity.java b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
index 1fd64d4..dd60bc9 100644
--- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java
+++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
@@ -56,8 +56,8 @@ public class CustomRomActivity extends AppCompatActivity {
     boolean iseditparams = false;
     public String previousName = "";
     public boolean addromnowdone = false;
-    public static String vmID = VMManager.idGenerator();
-    public int port = VMManager.startRandomPort();
+    private String vmID = VMManager.idGenerator();
+    private int port = VMManager.startRandomPort();
     private boolean created = false;
     private String thumbnailPath = "";
     private final Timer _timer = new Timer();
@@ -114,6 +114,7 @@ public class CustomRomActivity extends AppCompatActivity {
         binding.driveField.setEndIconOnClickListener(v -> {
             if (Objects.requireNonNull(binding.drive.getText()).toString().isEmpty()) {
                 CreateImageDialogFragment dialogFragment = new CreateImageDialogFragment();
+                dialogFragment.folder = AppConfig.vmFolder + vmID + "/";
                 dialogFragment.customRom = true;
                 dialogFragment.filename = Objects.requireNonNull(binding.title.getText()).toString();
                 dialogFragment.drive = binding.drive;
@@ -244,7 +245,7 @@ public class CustomRomActivity extends AppCompatActivity {
             thumbnailPath = current.itemIcon;
             vmID = getIntent().getStringExtra("VMID");
 
-            if (vmID != null && vmID.isEmpty()) {
+            if (vmID == null || vmID.isEmpty()) {
                 vmID = VMManager.idGenerator();
             }
 
diff --git a/app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java b/app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java
index 30b4dd2..c2ef60e 100644
--- a/app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java
+++ b/app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java
@@ -30,7 +30,7 @@ public class CreateImageDialogFragment extends DialogFragment {
 
     public boolean customRom = false;
 
-    public String folder = AppConfig.vmFolder + CustomRomActivity.vmID + "/";
+    public String folder = AppConfig.maindirpath;
     public String filename = "disk";
     public TextInputEditText drive;
     public TextInputLayout driveLayout;
diff --git a/app/src/main/java/com/vectras/vm/SetArchActivity.java b/app/src/main/java/com/vectras/vm/SetArchActivity.java
index da71fdd..10221b0 100644
--- a/app/src/main/java/com/vectras/vm/SetArchActivity.java
+++ b/app/src/main/java/com/vectras/vm/SetArchActivity.java
@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.vectras.qemu.MainSettingsManager;
 import com.vectras.vm.databinding.ActivitySetArchBinding;
+import com.vectras.vm.home.HomeActivity;
 import com.vectras.vm.utils.FileUtils;
 import com.vectras.vm.utils.UIUtils;
 
@@ -50,9 +51,7 @@ public class SetArchActivity extends AppCompatActivity implements View.OnClickLi
 
         binding.toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.roms_store) {
-
-                Intent intent = new Intent(this, RomsManagerActivity.class);
-                startActivity(intent);
+                HomeActivity.isOpenRomStore = true;
                 finish();
                 return true;
             }
diff --git a/app/src/main/java/com/vectras/vm/home/HomeActivity.java b/app/src/main/java/com/vectras/vm/home/HomeActivity.java
index b4eac8d..33956b8 100644
--- a/app/src/main/java/com/vectras/vm/home/HomeActivity.java
+++ b/app/src/main/java/com/vectras/vm/home/HomeActivity.java
@@ -1,32 +1,28 @@
 package com.vectras.vm.home;
 
-import static android.content.Intent.ACTION_OPEN_DOCUMENT;
 import static android.content.Intent.ACTION_VIEW;
-import static android.os.Build.VERSION.SDK_INT;
 import static com.vectras.vm.VectrasApp.getApp;
-import static com.vectras.vm.utils.UIUtils.UIAlert;
 
 import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.StrictMode;
-import android.provider.DocumentsContract;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ProgressBar;
+import android.widget.TextView;
 
-import androidx.activity.EdgeToEdge;
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
@@ -39,6 +35,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.color.MaterialColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
 import com.termux.app.TermuxActivity;
 import com.vectras.qemu.Config;
@@ -46,7 +43,6 @@ import com.vectras.qemu.MainSettingsManager;
 import com.vectras.vm.AboutActivity;
 import com.vectras.vm.AppConfig;
 import com.vectras.vm.CustomRomActivity;
-import com.vectras.vm.DataExplorerActivity;
 import com.vectras.vm.Minitools;
 import com.vectras.vm.R;
 import com.vectras.vm.RequestNetwork;
@@ -81,24 +77,23 @@ import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 public class HomeActivity extends AppCompatActivity implements RomStoreFragment.RomStoreCallToHomeListener, VmsFragment.VmsCallToHomeListener {
-
-    public static String curRomName;
     private final String TAG = "HomeActivity";
     public static boolean isActivate = false;
+    public static boolean isOpenRomStore = false;
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
     ActivityHomeBinding binding;
     ActivityHomeContentBinding bindingContent;
     private RomStoreHomeAdapterSearch adapterRomStoreSearch;
@@ -210,13 +205,10 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
                 bindingContent.searchbar.setEnabled(false);
             }
 
-            if (selectedFragment != null) {
-                getSupportFragmentManager().beginTransaction()
-                        .replace(bindingContent.containerView.getId(), selectedFragment)
-                        .commit();
-                return true;
-            }
-            return false;
+            getSupportFragmentManager().beginTransaction()
+                    .replace(bindingContent.containerView.getId(), selectedFragment)
+                    .commit();
+            return true;
         });
 
         getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
@@ -308,178 +300,76 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
 
         DisplaySystem.reLaunchVNC(this);
         PendingCommand.runNow(this);
-    }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent ReturnedIntent) {
-        super.onActivityResult(requestCode, resultCode, ReturnedIntent);
-        if (requestCode == 1004 && resultCode == RESULT_OK) {
-            Uri content_describer = ReturnedIntent.getData();
-            File selectedFilePath = new File(getPath(content_describer));
-            ProgressBar loading = findViewById(R.id.loading);
-            if (selectedFilePath.toString().endsWith(".iso")) {
-                loading.setVisibility(View.VISIBLE);
-                new Thread(() -> {
-                    FileInputStream File;
-                    try {
-                        assert content_describer != null;
-                        File = (FileInputStream) getContentResolver().openInputStream(content_describer);
-                    } catch (FileNotFoundException e) {
-                        throw new RuntimeException(e);
-                    }
-                    try {
-                        try {
-                            try (OutputStream out = new FileOutputStream(AppConfig.maindirpath + "/drive.iso")) {
-                                // Transfer bytes from in to out
-                                byte[] buf = new byte[1024];
-                                int len;
-                                while (true) {
-                                    assert File != null;
-                                    if (!((len = File.read(buf)) > 0)) break;
-                                    out.write(buf, 0, len);
-                                }
-                            }
-                        } finally {
-                            Runnable runnable = () -> loading.setVisibility(View.GONE);
-                            runOnUiThread(runnable);
-                            assert File != null;
-                            File.close();
-                        }
-                    } catch (IOException e) {
-                        Runnable runnable = () -> {
-                            loading.setVisibility(View.GONE);
-                            UIAlert(this, e.toString(), "error");
-                        };
-                        runOnUiThread(runnable);
-                    }
-                }).start();
-            } else
-                UIAlert(this, "please select iso file", "INVALID FILE");
-        } else if (requestCode == 1005 && resultCode == RESULT_OK) {
-            Uri content_describer = ReturnedIntent.getData();
-            ProgressBar loading = findViewById(R.id.loading);
-            loading.setVisibility(View.VISIBLE);
-            new Thread(() -> {
-                FileInputStream File;
-                try {
-                    assert content_describer != null;
-                    File = (FileInputStream) getContentResolver().openInputStream(content_describer);
-                } catch (FileNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-                try {
-                    try {
-                        try (OutputStream out = new FileOutputStream(AppConfig.maindirpath + "/hdd1.qcow2")) {
-                            // Transfer bytes from in to out
-                            byte[] buf = new byte[1024];
-                            int len;
-                            while (true) {
-                                assert File != null;
-                                if (!((len = File.read(buf)) > 0)) break;
-                                out.write(buf, 0, len);
-                            }
-                        }
-                    } finally {
-                        Runnable runnable = () -> loading.setVisibility(View.GONE);
-                        runOnUiThread(runnable);
-                        assert File != null;
-                        File.close();
-                    }
-                } catch (IOException e) {
-                    Runnable runnable = () -> {
-                        loading.setVisibility(View.GONE);
-                        UIAlert(this, e.toString(), "error");
-                    };
-                    runOnUiThread(runnable);
-                }
-            }).start();
-        } else if (requestCode == 1006 && resultCode == RESULT_OK) {
-            Uri content_describer = ReturnedIntent.getData();
-            ProgressBar loading = findViewById(R.id.loading);
-            loading.setVisibility(View.VISIBLE);
-            new Thread(() -> {
-                FileInputStream File;
-                try {
-                    assert content_describer != null;
-                    File = (FileInputStream) getContentResolver().openInputStream(content_describer);
-                } catch (FileNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-                try {
-                    try {
-                        try (OutputStream out = new FileOutputStream(AppConfig.maindirpath + "/hdd2.qcow2")) {
-                            // Transfer bytes from in to out
-                            byte[] buf = new byte[1024];
-                            int len;
-                            while (true) {
-                                assert File != null;
-                                if (!((len = File.read(buf)) > 0)) break;
-                                out.write(buf, 0, len);
-                            }
-                        }
-                    } finally {
-                        Runnable runnable = () -> loading.setVisibility(View.GONE);
-                        runOnUiThread(runnable);
-                        assert File != null;
-                        File.close();
-                    }
-                } catch (IOException e) {
-                    Runnable runnable = () -> {
-                        loading.setVisibility(View.GONE);
-                        UIAlert(this, e.toString(), "error");
-                    };
-                    runOnUiThread(runnable);
-                }
-            }).start();
-        } else if (requestCode == 122 && resultCode == RESULT_OK) {
-            Uri content_describer = ReturnedIntent.getData();
-            File selectedFilePath = new File(getPath(content_describer));
-            ProgressBar loading = findViewById(R.id.loading);
-            loading.setVisibility(View.VISIBLE);
-            new Thread(() -> {
-                FileInputStream File;
-                try {
-                    assert content_describer != null;
-                    File = (FileInputStream) getContentResolver().openInputStream(content_describer);
-                } catch (FileNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-                try {
-                    try {
-                        File romDir = new File(AppConfig.maindirpath + curRomName + "/");
-                        if (!romDir.exists()) {
-                            if(!romDir.mkdirs()) return;
-                        }
-                        try (OutputStream out = new FileOutputStream(AppConfig.maindirpath + curRomName + "/" + "drv1-" + selectedFilePath.getName())) {
-                            // Transfer bytes from in to out
-                            byte[] buf = new byte[1024];
-                            int len;
-                            while (true) {
-                                assert File != null;
-                                if (!((len = File.read(buf)) > 0)) break;
-                                out.write(buf, 0, len);
-                            }
-                        }
-                    } finally {
-                        Runnable runnable = () -> loading.setVisibility(View.GONE);
-                        runOnUiThread(runnable);
-                        assert File != null;
-                        File.close();
-                    }
-                } catch (IOException e) {
-                    Runnable runnable = () -> {
-                        loading.setVisibility(View.GONE);
-                        UIAlert(this, e.toString(), "error");
-                    };
-                    runOnUiThread(runnable);
-                }
-            }).start();
+        if (isOpenRomStore) {
+            isOpenRomStore = false;
+            bindingContent.bottomNavigation.setSelectedItemId(R.id.item_romstore);
+
         }
     }
 
-    public String getPath(Uri uri) {
-        return FileUtils.getPath(this, uri);
-    }
+    private final ActivityResultLauncher<String> isoPicker =
+            registerForActivityResult(new ActivityResultContracts.GetContent(), uri -> {
+                if (uri == null) return;
+
+                if (VMManager.isAISOFile(FileUtils.getFileNameFromUri(this, uri))) {
+                    importFile(uri, AppConfig.importedDriveFolder + "/drive.iso");
+                } else {
+                    DialogUtils.twoDialog(this,
+                            getString(R.string.problem_has_been_detected),
+                            getString(R.string.file_format_is_not_supported),
+                            getResources().getString(R.string.continuetext),
+                            getResources().getString(R.string.cancel),
+                            true,
+                            R.drawable.album_24px,
+                            true,
+                            () -> importFile(uri, AppConfig.importedDriveFolder + "/drive.iso"),
+                            null,
+                            null);
+                }
+            });
+
+    private final ActivityResultLauncher<String> hdd1Picker =
+            registerForActivityResult(new ActivityResultContracts.GetContent(), uri -> {
+                if (uri == null) return;
+
+                if (VMManager.isADiskFile(FileUtils.getFileNameFromUri(this, uri))) {
+                    importFile(uri, AppConfig.importedDriveFolder + "/hdd1.qcow2");
+                } else {
+                    DialogUtils.twoDialog(this,
+                            getString(R.string.problem_has_been_detected),
+                            getString(R.string.file_format_is_not_supported),
+                            getResources().getString(R.string.continuetext),
+                            getResources().getString(R.string.cancel),
+                            true,
+                            R.drawable.hard_drive_24px,
+                            true,
+                            () -> importFile(uri, AppConfig.importedDriveFolder + "/hdd1.qcow2"),
+                            null,
+                            null);
+                }
+            });
+
+    private final ActivityResultLauncher<String> hdd2Picker =
+            registerForActivityResult(new ActivityResultContracts.GetContent(), uri -> {
+                if (uri == null) return;
+
+                if (VMManager.isADiskFile(FileUtils.getFileNameFromUri(this, uri))) {
+                    importFile(uri, AppConfig.importedDriveFolder + "/hdd2.qcow2");
+                } else {
+                    DialogUtils.twoDialog(this,
+                            getString(R.string.problem_has_been_detected),
+                            getString(R.string.file_format_is_not_supported),
+                            getResources().getString(R.string.continuetext),
+                            getResources().getString(R.string.cancel),
+                            true,
+                            R.drawable.hard_drive_24px,
+                            true,
+                            () -> importFile(uri, AppConfig.importedDriveFolder + "/hdd2.qcow2"),
+                            null,
+                            null);
+                }
+            });
 
     private void setupDrawer() {
         binding.drawerLayout.setScrimColor(Color.parseColor("#40000000")); //25%
@@ -506,157 +396,82 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
                 w.setData(Uri.parse(tw));
                 startActivity(w);
             } else if (id == R.id.navigation_item_import_iso) {
-                if (new File(AppConfig.maindirpath + "/drive.iso").exists()) {
-                    AlertDialog ad;
-                    ad = new AlertDialog.Builder(this, R.style.MainDialogTheme).create();
-                    ad.setTitle("REPLACE ISO");
-                    ad.setMessage("there is iso imported you want to replace it?");
-                    ad.setButton(Dialog.BUTTON_POSITIVE, "REPLACE", (dialog, which) -> {
-                        Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                        intent.addCategory(Intent.CATEGORY_OPENABLE);
-                        intent.setType("*/*");
-
-                        // Optionally, specify a URI for the file that should appear in the
-                        // system file picker when it loads.
-                        if (SDK_INT >= Build.VERSION_CODES.O) {
-                            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                        }
-
-                        startActivityForResult(intent, 1004);
-                    });
-                    ad.setButton(Dialog.BUTTON_NEGATIVE, "REMOVE", (dialog, which) -> {
-                        File isoFile = new File(AppConfig.maindirpath + "/drive.iso");
-                        try {
-                            if(!isoFile.delete()) Log.e(TAG, "Delete drive.iso failed!");
-                        } catch (Exception e) {
-                            Log.e(TAG, "Delete drive.iso: ", e);
-                        }
-                    });
-                    ad.show();
+                if (new File(AppConfig.importedDriveFolder + "/drive.iso").exists()) {
+                    DialogUtils.threeDialog(
+                            this,
+                            "Replace iso",
+                            "There is iso imported you want to replace it?",
+                            getString(R.string.replace),
+                            getString(R.string.cancel),
+                            getString(R.string.remove),
+                            true,
+                            R.drawable.album_24px,
+                            true,
+                            () -> isoPicker.launch("*/*"),
+                            null,
+                            () -> {
+                                try {
+                                    File isoFile = new File(AppConfig.importedDriveFolder + "/drive.iso");
+                                    DialogUtils.fileDeletionResult(this, isoFile.delete());
+                                } catch (Exception e) {
+                                    DialogUtils.fileDeletionResult(this, false);
+                                }
+                            },
+                            null);
                 } else {
-                    Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType("*/*");
-
-                    // Optionally, specify a URI for the file that should appear in the
-                    // system file picker when it loads.
-                    if (SDK_INT >= Build.VERSION_CODES.O) {
-                        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                    }
-
-                    startActivityForResult(intent, 1004);
+                    isoPicker.launch("*/*");
                 }
             } else if (id == R.id.navigation_item_hdd1) {
-                if (new File(AppConfig.maindirpath + "/hdd1.qcow2").exists()) {
-                    AlertDialog ad;
-                    ad = new AlertDialog.Builder(this, R.style.MainDialogTheme).create();
-                    ad.setTitle("REPLACE HDD1");
-                    ad.setMessage("there is hdd1 imported you want to replace it?");
-                    ad.setButton(Dialog.BUTTON_POSITIVE, "REPLACE", (dialog, which) -> {
-                        Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                        intent.addCategory(Intent.CATEGORY_OPENABLE);
-                        intent.setType("*/*");
-
-                        // Optionally, specify a URI for the file that should appear in the
-                        // system file picker when it loads.
-                        if (SDK_INT >= Build.VERSION_CODES.O) {
-                            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                        }
-
-                        startActivityForResult(intent, 1006);
-                    });
-                    ad.setButton(Dialog.BUTTON_NEGATIVE, "REMOVE", (dialog, which) -> {
-                        File isoFile = new File(AppConfig.maindirpath + "/hdd1.qcow2");
-                        try {
-                            if(!isoFile.delete()) Log.e(TAG, "Delete hdd1.qcow2 failed!");
-                        } catch (Exception e) {
-                            Log.e(TAG, "Delete hdd1.qcow2: ", e);
-                        }
-                    });
-                    ad.setButton(Dialog.BUTTON_NEUTRAL, "SHARE", (dialog, which) -> {
-                        Intent intentShareFile = new Intent(Intent.ACTION_SEND);
-                        File fileWithinMyDir = new File(AppConfig.maindirpath + "/hdd1.qcow2");
-
-                        if (fileWithinMyDir.exists()) {
-                            intentShareFile.setType("*/*");
-                            intentShareFile.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + AppConfig.maindirpath + "/hdd1.qcow2"));
-
-                            intentShareFile.putExtra(Intent.EXTRA_SUBJECT,
-                                    "Sharing File...");
-                            intentShareFile.putExtra(Intent.EXTRA_TEXT, "Sharing File...");
-
-                            startActivity(Intent.createChooser(intentShareFile, "Share File"));
-                        }
-                    });
-                    ad.show();
+                if (new File(AppConfig.importedDriveFolder + "/hdd1.qcow2").exists()) {
+                    DialogUtils.threeDialog(
+                            this,
+                            "Replace HDD1",
+                            "There is HDD1 imported you want to replace it?",
+                            getString(R.string.replace),
+                            getString(R.string.cancel),
+                            getString(R.string.remove),
+                            true,
+                            R.drawable.hard_drive_24px,
+                            true,
+                            () -> hdd1Picker.launch("*/*"),
+                            null,
+                            () -> {
+                                try {
+                                    File hdd1File = new File(AppConfig.importedDriveFolder + "/hdd1.qcow2");
+                                    DialogUtils.fileDeletionResult(this, hdd1File.delete());
+                                } catch (Exception e) {
+                                    DialogUtils.fileDeletionResult(this, false);
+                                }
+                            },
+                            null);
                 } else {
-                    Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType("*/*");
-
-                    // Optionally, specify a URI for the file that should appear in the
-                    // system file picker when it loads.
-                    if (SDK_INT >= Build.VERSION_CODES.O) {
-                        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                    }
-
-                    startActivityForResult(intent, 1005);
+                    hdd1Picker.launch("*/*");
                 }
             } else if (id == R.id.navigation_item_hdd2) {
-                if (new File(AppConfig.maindirpath + "/hdd2.qcow2").exists()) {
-                    AlertDialog ad;
-                    ad = new AlertDialog.Builder(this, R.style.MainDialogTheme).create();
-                    ad.setTitle("REPLACE HDD2");
-                    ad.setMessage("there is hdd2 imported you want to replace it?");
-                    ad.setButton(Dialog.BUTTON_POSITIVE, "REPLACE", (dialog, which) -> {
-                        Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                        intent.addCategory(Intent.CATEGORY_OPENABLE);
-                        intent.setType("*/*");
-
-                        // Optionally, specify a URI for the file that should appear in the
-                        // system file picker when it loads.
-                        if (SDK_INT >= Build.VERSION_CODES.O) {
-                            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                        }
-
-                        startActivityForResult(intent, 1006);
-                    });
-                    ad.setButton(Dialog.BUTTON_NEGATIVE, "REMOVE", (dialog, which) -> {
-                        File isoFile = new File(AppConfig.maindirpath + "/hdd2.qcow2");
-                        try {
-                            if(!isoFile.delete()) Log.e(TAG, "Delete hdd2.qcow2 failed!");
-                        } catch (Exception e) {
-                            Log.e(TAG, "Delete hdd2.qcow2: ", e);
-                        }
-                    });
-                    ad.setButton(Dialog.BUTTON_NEUTRAL, "SHARE", (dialog, which) -> {
-                        Intent intentShareFile = new Intent(Intent.ACTION_SEND);
-                        File fileWithinMyDir = new File(AppConfig.maindirpath + "/hdd2.qcow2");
-
-                        if (fileWithinMyDir.exists()) {
-                            intentShareFile.setType("*/*");
-                            intentShareFile.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + AppConfig.maindirpath + "/hdd2.qcow2"));
-
-                            intentShareFile.putExtra(Intent.EXTRA_SUBJECT,
-                                    "Sharing File...");
-                            intentShareFile.putExtra(Intent.EXTRA_TEXT, "Sharing File...");
-
-                            startActivity(Intent.createChooser(intentShareFile, "Share File"));
-                        }
-                    });
-                    ad.show();
+                if (new File(AppConfig.importedDriveFolder + "/hdd2.qcow2").exists()) {
+                    DialogUtils.threeDialog(
+                            this,
+                            "Replace HDD2",
+                            "There is HDD2 imported you want to replace it?",
+                            getString(R.string.replace),
+                            getString(R.string.cancel),
+                            getString(R.string.remove),
+                            true,
+                            R.drawable.hard_drive_24px,
+                            true,
+                            () -> hdd2Picker.launch("*/*"),
+                            null,
+                            () -> {
+                                try {
+                                    File hdd1File = new File(AppConfig.importedDriveFolder + "/hdd2.qcow2");
+                                    DialogUtils.fileDeletionResult(this, hdd1File.delete());
+                                } catch (Exception e) {
+                                    DialogUtils.fileDeletionResult(this, false);
+                                }
+                            },
+                            null);
                 } else {
-                    Intent intent = new Intent(ACTION_OPEN_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType("*/*");
-
-                    // Optionally, specify a URI for the file that should appear in the
-                    // system file picker when it loads.
-                    if (SDK_INT >= Build.VERSION_CODES.O) {
-                        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.DIRECTORY_DOWNLOADS);
-                    }
-
-                    startActivityForResult(intent, 1006);
+                    hdd2Picker.launch("*/*");
                 }
             } else if (id == R.id.navigation_item_desktop) {
                 DisplaySystem.launchX11(this, true);
@@ -714,7 +529,8 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
             } else if (id == R.id.navigation_item_store) {
                 startActivity(new Intent(this, StoreActivity.class));
             } else if (id == R.id.navigation_data_explorer) {
-                startActivity(new Intent(this, DataExplorerActivity.class));
+//                startActivity(new Intent(this, DataExplorerActivity.class));
+                FileUtils.openFolder(this, AppConfig.maindirpath);
             } else if (id == R.id.navigation_item_donate) {
                 String tw = "https://www.patreon.com/VectrasTeam";
                 Intent w = new Intent(ACTION_VIEW);
@@ -803,7 +619,7 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
             }
         };
 
-        requestNetwork.startRequestNetwork(RequestNetworkController.GET,AppConfig.updateJson,"maincheckupdate",requestNetworkListener);
+        requestNetwork.startRequestNetwork(RequestNetworkController.GET, AppConfig.updateJson, "maincheckupdate", requestNetworkListener);
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -845,4 +661,42 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment.
 
         adapterRomStoreSearch.notifyDataSetChanged();
     }
+
+    private void importFile(Uri uri, String copyTo) {
+        if (uri == null) return;
+
+        View progressView = LayoutInflater.from(this).inflate(R.layout.dialog_progress_style, null);
+        TextView progress_text = progressView.findViewById(R.id.progress_text);
+        progress_text.setText(getString(R.string.importing_file));
+        AlertDialog progressDialog = new MaterialAlertDialogBuilder(this, R.style.CenteredDialogTheme)
+                .setView(progressView)
+                .setCancelable(false)
+                .create();
+        progressDialog.show();
+
+        AtomicBoolean isCompleted = new AtomicBoolean(false);
+        executor.execute(() -> {
+            try {
+                FileUtils.copyFileFromUri(this, uri, copyTo);
+                isCompleted.set(true);
+            } catch (Exception e) {
+                isCompleted.set(false);
+            } finally {
+                runOnUiThread(() -> {
+                    progressDialog.dismiss();
+                    DialogUtils.oneDialog(
+                            this,
+                            isCompleted.get() ? getString(R.string.imported) : getString(R.string.oops),
+                            isCompleted.get() ? getString(R.string.file_imported_successfully) : getString(R.string.file_import_failed),
+                            getString(R.string.ok),
+                            true,
+                            isCompleted.get() ? R.drawable.check_24px : R.drawable.error_96px,
+                            true,
+                            null,
+                            null
+                    );
+                });
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vectras/vm/home/core/HomeStartVM.java b/app/src/main/java/com/vectras/vm/home/core/HomeStartVM.java
index 6be3408..20ffbc8 100644
--- a/app/src/main/java/com/vectras/vm/home/core/HomeStartVM.java
+++ b/app/src/main/java/com/vectras/vm/home/core/HomeStartVM.java
@@ -27,6 +27,7 @@ import com.vectras.vm.VMManager;
 import com.vectras.vm.logger.VectrasStatus;
 import com.vectras.vm.settings.ExternalVNCSettingsActivity;
 import com.vectras.vm.utils.DialogUtils;
+import com.vectras.vm.utils.FileUtils;
 import com.vectras.vm.utils.NetworkUtils;
 import com.vectras.vm.utils.ServiceUtils;
 
@@ -59,6 +60,25 @@ public class HomeStartVM {
             return;
         }
 
+        if (MainSettingsManager.getSharedFolder(activity)
+                && !MainSettingsManager.getArch(activity).equals("I386")
+                && FileUtils.getFolderSize(FileUtils.getExternalFilesDirectory(activity).getPath() + "/SharedFolder") / Math.pow(10, 2) > 516) {
+            DialogUtils.twoDialog(
+                    activity,
+                    activity.getString(R.string.problem_has_been_detected),
+                    activity.getString(R.string.shared_folder_is_too_large_content),
+                    activity.getString(R.string.open_shared_folder),
+                    activity.getString(R.string.close),
+                    true,
+                    R.drawable.warning_48px,
+                    true,
+                    () -> FileUtils.openFolder(activity, FileUtils.getExternalFilesDirectory(activity).getPath() + "/SharedFolder"),
+                    null,
+                    null
+            );
+            return;
+        }
+
         VMManager.lastQemuCommand = env;
 
         if (VMManager.isThisVMRunning(activity, itemExtra, itemPath)) {
diff --git a/app/src/main/java/com/vectras/vm/settings/VNCSettingsActivity.java b/app/src/main/java/com/vectras/vm/settings/VNCSettingsActivity.java
index 1e019d2..6c368f4 100644
--- a/app/src/main/java/com/vectras/vm/settings/VNCSettingsActivity.java
+++ b/app/src/main/java/com/vectras/vm/settings/VNCSettingsActivity.java
@@ -2,6 +2,7 @@ package com.vectras.vm.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -25,10 +26,16 @@ public class VNCSettingsActivity extends AppCompatActivity {
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        binding.toolbar.setNavigationOnClickListener(view -> onBackPressed());
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         initialize();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        binding.cvNotusingvnc.setVisibility(MainSettingsManager.getVmUi(this).equals("VNC") ? View.GONE : View.VISIBLE);
+    }
+
     private void initialize() {
         binding.swForcerefesh.setOnCheckedChangeListener((buttonView, isChecked) -> MainSettingsManager.setForceRefeshVNCDisplay(this, isChecked));
         binding.lnForcerefesh.setOnClickListener(v -> binding.swForcerefesh.toggle());
@@ -38,5 +45,12 @@ public class VNCSettingsActivity extends AppCompatActivity {
 
         binding.swForcerefesh.setChecked(MainSettingsManager.getForceRefeshVNCDisplay(this));
         binding.swExternal.setChecked(MainSettingsManager.getVncExternal(this));
+
+        binding.lnNotusingvnc.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.putExtra("goto", "qemu");
+            intent.setClass(this, MainSettingsManager.class);
+            startActivity(intent);
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vectras/vm/utils/DialogUtils.java b/app/src/main/java/com/vectras/vm/utils/DialogUtils.java
index 4d66003..57ccb54 100644
--- a/app/src/main/java/com/vectras/vm/utils/DialogUtils.java
+++ b/app/src/main/java/com/vectras/vm/utils/DialogUtils.java
@@ -60,6 +60,7 @@ public class DialogUtils {
         });
         dialog.show();
     }
+
     public static void twoDialog(Activity _context, String _title, String _message, String _textPositiveButton, String _textNegativeButton, boolean _isicon, int _iconid, boolean _cancel, Runnable _onPositive, Runnable _onNegative, Runnable _onDismiss) {
         View buttonsView = LayoutInflater.from(_context).inflate(R.layout.dialog_layout, null);
 
@@ -111,7 +112,7 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void threeDialog(Activity _context, String _title, String _message, String _textPositiveButton, String _textNegativeButton, String _textNeutralButton ,boolean _isicon, int _iconid, boolean _cancel, Runnable _onPositive, Runnable _onNegative, Runnable _onNeutral, Runnable _onDismiss) {
+    public static void threeDialog(Activity _context, String _title, String _message, String _textPositiveButton, String _textNegativeButton, String _textNeutralButton, boolean _isicon, int _iconid, boolean _cancel, Runnable _onPositive, Runnable _onNegative, Runnable _onNeutral, Runnable _onDismiss) {
         View buttonsView = LayoutInflater.from(_context).inflate(R.layout.dialog_layout, null);
 
         AlertDialog dialog = new AlertDialog.Builder(_context).create();
@@ -191,4 +192,32 @@ public class DialogUtils {
                     }, null);
         }
     }
+
+    public static void fileDeletionResult(Activity activity, boolean isCompleted) {
+        if (isCompleted) {
+            DialogUtils.oneDialog(
+                    activity,
+                    activity.getString(R.string.done),
+                    activity.getString(R.string.file_deleted),
+                    activity.getString(R.string.ok),
+                    true,
+                    R.drawable.check_24px,
+                    true,
+                    null,
+                    null
+            );
+        } else {
+            DialogUtils.oneDialog(
+                    activity,
+                    activity.getString(R.string.oops),
+                    activity.getString(R.string.delete_file_failed_content),
+                    activity.getString(R.string.ok),
+                    true,
+                    R.drawable.error_96px,
+                    true,
+                    null,
+                    null
+            );
+        }
+    }
 }
diff --git a/app/src/main/java/com/vectras/vm/utils/FileUtils.java b/app/src/main/java/com/vectras/vm/utils/FileUtils.java
index 93e626d..558b29f 100644
--- a/app/src/main/java/com/vectras/vm/utils/FileUtils.java
+++ b/app/src/main/java/com/vectras/vm/utils/FileUtils.java
@@ -3,6 +3,7 @@ package com.vectras.vm.utils;
 import android.annotation.SuppressLint;
 import android.content.ContentUris;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
@@ -31,6 +32,7 @@ import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
 
 import com.vectras.vm.R;
 
@@ -49,6 +51,8 @@ import java.util.Objects;
  * @author dev
  */
 public class FileUtils {
+	public static final String TAG = "FileUtils";
+
 	@NonNull
 	public static File getExternalFilesDirectory(Context context) {
 		return new File(Environment.getExternalStorageDirectory(), "Documents/VectrasVM");
@@ -793,7 +797,7 @@ public class FileUtils {
 		}
 	}
 
-	public static int getFolderSize(String _path) {
+	public static long getFolderSize(String _path) {
 		try {
 			File file;
 			file = new File(_path);
@@ -822,7 +826,7 @@ public class FileUtils {
 					}
 				}
 			}
-			return (int) result;
+			return result;
 		} catch (Exception _e) {
 			return 0;
 		}
@@ -832,19 +836,14 @@ public class FileUtils {
 		String filePath = null;
 		if ("content".equalsIgnoreCase(uri.getScheme())) {
 			String[] projection = {MediaStore.Files.FileColumns.DATA};
-			Cursor cursor = null;
-			try {
-				cursor = context.getContentResolver().query(uri, projection, null, null, null);
-				if (cursor != null && cursor.moveToFirst()) {
-					int index = cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.DATA);
-					filePath = cursor.getString(index);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			} finally {
-				if (cursor != null)
-					cursor.close();
-			}
+            try (Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null)) {
+                if (cursor != null && cursor.moveToFirst()) {
+                    int index = cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.DATA);
+                    filePath = cursor.getString(index);
+                }
+            } catch (Exception e) {
+				Log.e(TAG, "getFilePathFromUri: ", e);
+            }
 		} else if ("file".equalsIgnoreCase(uri.getScheme())) {
 			filePath = uri.getPath();
 		}
@@ -868,4 +867,53 @@ public class FileUtils {
 		}
 		return true;
 	}
+
+	public static void openFolder(Activity activity, String folderPath) {
+		File folder = new File(folderPath);
+
+		if (!folder.exists() || !folder.isDirectory()) {
+			DialogUtils.oneDialog(
+					activity,
+					activity.getString(R.string.oops),
+					activity.getString(R.string.directory_does_not_exist),
+					activity.getString(R.string.ok),
+					true,
+					R.drawable.error_96px,
+					true,
+					null,
+					null
+			);
+			Log.e(TAG, "openFolder: Folder not found!");
+			return;
+		}
+
+		Uri uri = FileProvider.getUriForFile(
+				activity,
+				activity.getPackageName() + ".provider",
+				folder
+		);
+
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		intent.setDataAndType(uri, "resource/folder");
+		intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+		try {
+			activity.startActivity(intent);
+		} catch (Exception e) {
+			DialogUtils.oneDialog(
+					activity,
+					activity.getString(R.string.oops),
+					activity.getString(R.string.there_is_no_app_to_perform_this_action),
+					activity.getString(R.string.ok),
+					true,
+					R.drawable.error_96px,
+					true,
+					null,
+					null
+			);
+			Log.e(TAG, "openFolder: " + e.getMessage());
+		}
+	}
 }
diff --git a/app/src/main/res/drawable-xhdpi/patreon_outline_225.png b/app/src/main/res/drawable-xhdpi/patreon_outline_225.png
new file mode 100644
index 0000000000000000000000000000000000000000..deb4123dfc227b4066e02d1b57dabbd27c1c6b29
GIT binary patch
literal 9339
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
T7I*MA5hO3I@;qPCEa?9LU0MTu

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/help_24px.xml b/app/src/main/res/drawable/help_24px.xml
new file mode 100644
index 0000000..7f116ea
--- /dev/null
+++ b/app/src/main/res/drawable/help_24px.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M478,720Q499,720 513.5,705.5Q528,691 528,670Q528,649 513.5,634.5Q499,620 478,620Q457,620 442.5,634.5Q428,649 428,670Q428,691 442.5,705.5Q457,720 478,720ZM442,566L516,566Q516,533 523.5,514Q531,495 566,462Q592,436 607,412.5Q622,389 622,356Q622,300 581,270Q540,240 484,240Q427,240 391.5,270Q356,300 342,342L408,368Q413,350 430.5,329Q448,308 484,308Q516,308 532,325.5Q548,343 548,364Q548,384 536,401.5Q524,419 506,434Q462,473 452,493Q442,513 442,566ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/overview_24px.xml b/app/src/main/res/drawable/overview_24px.xml
new file mode 100644
index 0000000..a3ff2b7
--- /dev/null
+++ b/app/src/main/res/drawable/overview_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M787,815L815,787L740,712L740,600L700,600L700,728L787,815ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,468Q821,459 801,452.5Q781,446 760,443L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L442,760Q445,782 451.5,802Q458,822 467,840L200,840ZM200,720Q200,731 200,740.5Q200,750 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,443Q200,441 200,440.5Q200,440 200,440Q200,440 200,522Q200,604 200,720ZM280,680L443,680Q446,659 452.5,639Q459,619 467,600L280,600L280,680ZM280,520L524,520Q556,490 595.5,470Q635,450 680,443L680,440L280,440L280,520ZM280,360L680,360L680,280L280,280L280,360ZM720,920Q637,920 578.5,861.5Q520,803 520,720Q520,637 578.5,578.5Q637,520 720,520Q803,520 861.5,578.5Q920,637 920,720Q920,803 861.5,861.5Q803,920 720,920Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_vnc_settings.xml b/app/src/main/res/layout/activity_vnc_settings.xml
index f7f9191..2fe7e2a 100644
--- a/app/src/main/res/layout/activity_vnc_settings.xml
+++ b/app/src/main/res/layout/activity_vnc_settings.xml
@@ -47,6 +47,35 @@
             android:orientation="vertical"
             android:animateLayoutChanges="true">
 
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cv_notusingvnc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="16dp"
+                app:cardBackgroundColor="?attr/colorSurfaceContainer"
+                style="@style/Widget.Material3.CardView.Filled"
+                android:visibility="gone"
+                tools:visibility="visible">
+                <LinearLayout
+                    android:id="@+id/ln_notusingvnc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:gravity="center_vertical"
+                    android:background="?attr/selectableItemBackground">
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/warning_48px"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="16dp"
+                        android:text="@string/you_are_using_x11_instead_of_vnc_content"/>
+
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/ln_forcerefesh"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/home_drawer_menu.xml b/app/src/main/res/menu/home_drawer_menu.xml
index 1c14b46..967efce 100644
--- a/app/src/main/res/menu/home_drawer_menu.xml
+++ b/app/src/main/res/menu/home_drawer_menu.xml
@@ -12,23 +12,18 @@
         android:title="@string/roms_store" />
     <item
         android:id="@+id/navigation_item_import_iso"
-        android:icon="@drawable/round_album_24"
+        android:icon="@drawable/album_24px"
         android:title="@string/import_iso"
         android:visible="false"/>
     <item
         android:id="@+id/navigation_item_hdd1"
-        android:icon="@drawable/round_storage_24"
+        android:icon="@drawable/hard_drive_24px"
         android:title="@string/hdd1"/>
     <item
         android:id="@+id/navigation_item_hdd2"
-        android:icon="@drawable/round_storage_24"
+        android:icon="@drawable/hard_drive_24px"
         android:title="@string/hdd2"
         android:visible="false"/>
-    <item
-        android:id="@+id/navigation_data_explorer"
-        android:icon="@drawable/round_folder_24"
-        android:visible="false"
-        android:title="@string/data_explorer"/>
     <item
         android:id="@+id/navigation_item_desktop"
         android:icon="@drawable/desktop_24px"
@@ -39,31 +34,35 @@
         android:title="@string/terminal"/>
     <item
         android:id="@+id/navigation_item_view_logs"
-        android:icon="@drawable/round_adb_24"
+        android:icon="@drawable/overview_24px"
         android:title="@string/view_logs" />
     <item
         android:id="@+id/navigation_item_settings"
-        android:icon="@drawable/round_settings_24"
+        android:icon="@drawable/settings_24px"
         android:title="@string/settings"/>
     <item
         android:id="@+id/mini_tools"
         android:icon="@drawable/home_repair_service_24px"
         android:title="@string/mini_tools"/>
+    <item
+        android:id="@+id/navigation_data_explorer"
+        android:icon="@drawable/folder_24px"
+        android:title="@string/open_main_folder"/>
     <item
         android:id="@+id/navigation_item_website"
         android:icon="@drawable/round_public_24"
         android:title="@string/vectras_website" />
     <item
         android:id="@+id/navigation_item_donate"
-        android:icon="@drawable/ic_patreon"
+        android:icon="@drawable/patreon_outline_225"
         android:title="@string/patreon"/>
     <item
         android:id="@+id/navigation_item_help"
-        android:icon="@drawable/round_help_24"
+        android:icon="@drawable/help_24px"
         android:title="@string/help"/>
     <item
         android:id="@+id/navigation_item_info"
-        android:icon="@drawable/round_info_24"
+        android:icon="@drawable/info_24px"
         android:title="@string/about"/>
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d87f551..aaec4cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Vectras VM</string>
 
     <!--======================VECTRAS STRINGS====================-->
-    <string name="app_version" translatable="false">v2.9.5.11-3dfx</string>
+    <string name="app_version" translatable="false">v2.9.5.12-3dfx</string>
     <string name="qemu_version" translatable="false">Stable</string>
     <string name="str_home">Home</string>
     <string name="str_logger">Logger</string>
@@ -54,7 +54,7 @@
     <string name="login_failed">"Login failed"</string>
     <string name="profile">Profile</string>
     <string name="apps_amp_games"><![CDATA[Apps & Games]]></string>
-    <string name="vectras_website">Vectras Website</string>
+    <string name="vectras_website">Vectras website</string>
     <string name="about">About</string>
     <string name="emulation_information">Emulation Information</string>
     <string name="full_name">Full Name</string>
@@ -81,7 +81,7 @@
     <string name="calibrate_mouse">Calibrate Mouse</string>
     <string name="hide_controller">HIDE CONTROLLER</string>
     <string name="remove">Remove</string>
-    <string name="view_logs">View Logs</string>
+    <string name="view_logs">View logs</string>
     <string name="title_activity_set_arch">SetArchActivity</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
@@ -556,6 +556,19 @@
     <string name="force_refresh">Force refresh</string>
     <string name="force_refresh_vnc_description">The VNC screen will restart every time there is a change, which helps troubleshoot problems.</string>
     <string name="settings_for_vnc">Settings for VNC.</string>
+    <string name="imported">Imported</string>
+    <string name="file_imported_successfully">File imported successfully.</string>
+    <string name="file_import_failed">File import failed.</string>
+    <string name="importing_file">Importing file…</string>
+    <string name="replace">Replace</string>
+    <string name="delete_file_failed_content">An error occurred while deleting the file, please try again later.</string>
+    <string name="file_deleted">File deleted.</string>
+    <string name="open_main_folder">Open main folder</string>
+    <string name="you_are_using_x11_instead_of_vnc_content">You are using X11 instead of VNC. To use VNC, go to Settings, go to QEMU, scroll down to the bottom and in the UI select VNC.</string>
+    <string name="there_is_no_app_to_perform_this_action">There is no app to perform this action.</string>
+    <string name="directory_does_not_exist">Directory does not exist.</string>
+    <string name="shared_folder_is_too_large_content">The shared folder is too large. Please delete some of the following files so that the total size of all files in the shared folder does not exceed 516 MB.</string>
+    <string name="open_shared_folder">Open shared folder</string>
 
 
     <!--======================TERMUX STRINGS====================-->
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
new file mode 100644
index 0000000..fbec41b
--- /dev/null
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,5 @@
+<paths>
+    <external-path
+        name="external_files"
+        path="." />
+</paths>
\ No newline at end of file
diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json
index ef3acf9..bcc03ef 100644
--- a/web/data/UpdateConfig.json
+++ b/web/data/UpdateConfig.json
@@ -1,15 +1,15 @@
 {
     "versionCode":"21",
-    "versionName":"v2.9.5-3dfx,v2.9.5-3dfx-almondcake,v2.9.5-3dfx-bread,v2.9.5-3dfx-churro,v2.9.5-3dfx-doughnut,v2.9.5-3dfx-empanada,v2.9.5-3dfx-flan,v2.9.5-3dfx-gugelhupf,v2.9.5-3dfx-hamentaschen,v2.9.5-3dfx-italianice,v2.9.5-3dfx-ladyfingers,v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-ube-halaya,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx,v2.9.5.11-3dfx",
+    "versionName":"v2.9.5-3dfx,v2.9.5-3dfx-almondcake,v2.9.5-3dfx-bread,v2.9.5-3dfx-churro,v2.9.5-3dfx-doughnut,v2.9.5-3dfx-empanada,v2.9.5-3dfx-flan,v2.9.5-3dfx-gugelhupf,v2.9.5-3dfx-hamentaschen,v2.9.5-3dfx-italianice,v2.9.5-3dfx-ladyfingers,v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-ube-halaya,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx,v2.9.5.11-3dfx,v2.9.5.12-3dfx",
     "size": "46 MB",
     "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases/v2.9.5",
     "Message": "<h2>v2.9.5-3dfx</h2><ul><li>Bring back 3dfx support.</li><li>Enhance app execution.</li><li>Added some linux programs in x11 display.</li><li>Added alpine linux (x11).</li><li>Russian language by <a href=\"https://github.com/OFGING\" target=\"_blank\">@OFGING</a></li></ul><br><br>New updates are live!",
     "cancellable": true,
     "versionCodeBeta":"21",
-    "versionNameBeta":"v2.9.5.11-3dfx",
-    "versionNameBetas":"v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx,v2.9.5.11-3dfx",
+    "versionNameBeta":"v2.9.5.12-3dfx",
+    "versionNameBetas":"v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx,v2.9.5.11-3dfx,v2.9.5.12-3dfx",
     "sizeBeta": "41 MB",
     "urlBeta": "https://github.com/AnBui2004/Vectras-VM-Emu-Android/releases",
-    "MessageBeta": "<h2>v2.9.5.11-3dfx</h2>Bugs fixed.",
+    "MessageBeta": "<h2>v2.9.5.12-3dfx</h2>Bugs fixed.",
     "cancellableBeta": true
 }