diff --git a/app/build.gradle b/app/build.gradle index e7efdb9..87bf687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.vectras.vm" minSdk minApi targetSdk targetApi - versionCode 92 - versionName "3.8.8" + versionCode 93 + versionName "3.8.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true diff --git a/app/src/main/java/com/vectras/vm/main/core/MainStartVM.java b/app/src/main/java/com/vectras/vm/main/core/MainStartVM.java index b164c06..748547b 100644 --- a/app/src/main/java/com/vectras/vm/main/core/MainStartVM.java +++ b/app/src/main/java/com/vectras/vm/main/core/MainStartVM.java @@ -312,7 +312,8 @@ public class MainStartVM { // } else if (MainSettingsManager.getVmUi(activity).equals("SPICE")) { // //This feature is not available yet. } else if (MainSettingsManager.getVmUi(context).equals("X11") && !DisplaySystem.isUseBuiltInX11()) { - DisplaySystem.launch(context); + assert activity != null; + activity.runOnUiThread(() -> DisplaySystem.launch(context)); } Log.i(TAG, "Virtual machine running."); diff --git a/app/src/main/java/com/vectras/vm/utils/ProgressDialog.java b/app/src/main/java/com/vectras/vm/utils/ProgressDialog.java index 10fc037..46c8049 100644 --- a/app/src/main/java/com/vectras/vm/utils/ProgressDialog.java +++ b/app/src/main/java/com/vectras/vm/utils/ProgressDialog.java @@ -4,6 +4,8 @@ import android.app.Activity; import android.content.Context; import android.os.Build; import android.view.LayoutInflater; +import android.widget.ProgressBar; +import android.widget.TextView; import androidx.appcompat.app.AlertDialog; @@ -23,6 +25,9 @@ public class ProgressDialog { private Integer max; private Boolean isIndeterminate; + private ProgressBar progressBar; + private TextView textview; + public ProgressDialog(Context context) { this.context = context; } @@ -49,7 +54,10 @@ public class ProgressDialog { if (isIndeterminate != null) binding.progressBar.setIndeterminate(isIndeterminate); - if (isFixTextColor) binding.progressText.setTextColor(MaterialColors.getColor(binding.progressText, com.google.android.material.R.attr.colorOnSurface)); + if (isFixTextColor != null && isFixTextColor) binding.progressText.setTextColor(MaterialColors.getColor(binding.progressText, com.google.android.material.R.attr.colorOnSurface)); + + progressBar = binding.progressBar; + textview = binding.progressText; dialog = new MaterialAlertDialogBuilder(context, R.style.CenteredDialogTheme) .setView(binding.getRoot()) @@ -95,10 +103,20 @@ public class ProgressDialog { return dialog != null && dialog.isShowing(); } + public ProgressBar getProgressBar() { + return progressBar; + } + + public TextView getTextview() { + return textview; + } + public void dismiss() { DialogUtils.safeDismiss((Activity) context, dialog); binding = null; dialog = null; + progressBar = null; + textview = null; } public void reset() { @@ -107,5 +125,7 @@ public class ProgressDialog { progress = null; max = null; isIndeterminate = null; + progressBar = null; + textview = null; } } diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index 473775d..e78cd48 100644 --- a/web/data/UpdateConfig.json +++ b/web/data/UpdateConfig.json @@ -5,11 +5,11 @@ "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases", "Message": "