diff --git a/app/build.gradle b/app/build.gradle index df66c7c..150e85a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdk minApi targetSdk targetApi versionCode 19 - versionName "v2.9.3-chick" + versionName "v2.9.3-velvet" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } diff --git a/app/src/main/java/com/vectras/vm/CustomRomActivity.java b/app/src/main/java/com/vectras/vm/CustomRomActivity.java index b271cd9..1751b98 100644 --- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java +++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java @@ -1025,14 +1025,16 @@ public void run() { title.setText(jObj.getString("title")); icon.setText(AppConfig.maindirpath + "roms/" + _filename.replace(".cvbi", "") + "/" + jObj.getString("icon")); - drive.setText(AppConfig.maindirpath - + "roms/" + _filename.replace(".cvbi", "") + "/" + jObj.getString("drive")); + if (!jObj.getString("drive").isEmpty()) { + drive.setText(AppConfig.maindirpath + + "roms/" + _filename.replace(".cvbi", "") + "/" + jObj.getString("drive")); + } qemu.setText(jObj.getString("qemu")); ImageView ivIcon = findViewById(R.id.ivIcon); Bitmap bmImg = BitmapFactory.decodeFile(AppConfig.maindirpath + "roms/" + _filename.replace(".cvbi", "") + "/" + jObj.getString("icon")); ivIcon.setImageBitmap(bmImg); - UIUtils.UIAlert(activity, getResources().getString(R.string.from) + ": " + jObj.getString("author") + "\n\n" + Html.fromHtml(jObj.getString("desc")), getResources().getString(R.string.description) + ":"); + UIUtils.UIAlert(activity, getResources().getString(R.string.from) + ": " + jObj.getString("author"), getResources().getString(R.string.description) + ":\n\n" + Html.fromHtml(jObj.getString("desc"))); } catch (JSONException e) { throw new RuntimeException(e); } diff --git a/app/src/main/java/com/vectras/vm/SplashActivity.java b/app/src/main/java/com/vectras/vm/SplashActivity.java index 69bb1c1..c55fed9 100644 --- a/app/src/main/java/com/vectras/vm/SplashActivity.java +++ b/app/src/main/java/com/vectras/vm/SplashActivity.java @@ -331,10 +331,15 @@ public static void setupFolders() { public void run() { String filesDir = activity.getFilesDir().getAbsolutePath(); SharedPreferences prefs = getSharedPreferences(CREDENTIAL_SHARED_PREF, Context.MODE_PRIVATE); - if ((new File(filesDir, "/distro/usr/local/bin/qemu-system-x86_64").exists()) || (new File(filesDir, "/distro/usr/bin/qemu-system-x86_64").exists())) + if ((new File(filesDir, "/distro/usr/local/bin/qemu-system-x86_64").exists()) || (new File(filesDir, "/distro/usr/bin/qemu-system-x86_64").exists())) { startActivity(new Intent(this, MainActivity.class)); - else + } else { startActivity(new Intent(this, SetupQemuActivity.class)); + //For Android 14+ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + MainSettingsManager.setVmUi(this, "VNC"); + } + } finish(); } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fab6d7d..98d68f8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3,7 +3,7 @@ Vectras VM - v2.9.3 (Chick) + v2.9.3 (Velvet) مستقر الرئيسية سجل الأحداث diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fefa616..4391df5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ Vectras VM - v2.9.3 (Chick) + v2.9.3 (Velvet) Stable Home Logger diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index b388c50..9374f1e 100644 --- a/web/data/UpdateConfig.json +++ b/web/data/UpdateConfig.json @@ -1,6 +1,6 @@ { "versionCode":"19", - "versionName":"v2.9.3,v2.9.3-chick", + "versionName":"v2.9.3,v2.9.3-chick,v2.9.3-velvet", "size": "60 MB", "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases", "Message": "enhancments.",