diff --git a/app/build.gradle b/app/build.gradle index 4cd26cc..039a847 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.vectras.vm" minSdk minApi targetSdk targetApi - versionCode 60 - versionName "3.5.6" + versionCode 61 + versionName "3.5.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true diff --git a/app/src/main/java/com/vectras/vm/CqcmActivity.java b/app/src/main/java/com/vectras/vm/CqcmActivity.java index 9da687b..d4ca96b 100644 --- a/app/src/main/java/com/vectras/vm/CqcmActivity.java +++ b/app/src/main/java/com/vectras/vm/CqcmActivity.java @@ -24,10 +24,6 @@ import java.util.HashMap; import java.util.Objects; public class CqcmActivity extends AppCompatActivity { - - private final Intent gotoActivity = new Intent(); - private final Intent openURL = new Intent(); - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -115,17 +111,14 @@ public class CqcmActivity extends AppCompatActivity { } else { Toast.makeText(getApplicationContext(), "The virtual machine list data is corrupted and new virtual machines cannot be added right now.", Toast.LENGTH_LONG).show(); } - if(!MainActivity.isActivate) { - Log.i("CqcmActivity", "Vectras VM is not opening."); - gotoActivity.setClass(getApplicationContext(), SplashActivity.class); - startActivity(gotoActivity); - Log.i("CqcmActivity", "Opened SplashActivity"); + + if (!MainActivity.isActivate) { + startActivity(new Intent(this, SplashActivity.class)); } else { - Log.i("CqcmActivity", "Vectras VM is opening."); - openURL.setAction(Intent.ACTION_VIEW); - openURL.setData(Uri.parse("android-app://com.vectras.vm")); - startActivity(openURL); - Log.i("CqcmActivity", "Opened Vectras VM using URL."); + Intent intent = new Intent(); + intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + intent.setClass(this, MainActivity.class); + startActivity(intent); } finish(); } @@ -133,18 +126,13 @@ public class CqcmActivity extends AppCompatActivity { private void runCommand(String _command) { AppConfig.pendingCommand = _command; - if(!MainActivity.isActivate) { - Log.i("CqcmActivity", "Vectras VM is not opening."); - gotoActivity.setClass(getApplicationContext(), SplashActivity.class); - startActivity(gotoActivity); - Log.i("CqcmActivity", "Opened SplashActivity"); + if (!MainActivity.isActivate) { + startActivity(new Intent(this, SplashActivity.class)); } else { - Log.i("CqcmActivity", "Vectras VM is opening."); Intent intent = new Intent(); intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); intent.setClass(this, MainActivity.class); startActivity(intent); - Log.i("CqcmActivity", "Opened HomeActivity."); } finish(); } 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 32e92f1..32dfb78 100644 --- a/app/src/main/java/com/vectras/vm/utils/DialogUtils.java +++ b/app/src/main/java/com/vectras/vm/utils/DialogUtils.java @@ -240,7 +240,10 @@ public class DialogUtils { } public static boolean isAllowShow(Context context) { - return context instanceof Activity; + if (context instanceof Activity activity) { + return !activity.isFinishing() && !activity.isDestroyed(); + } + return false; } public static void joinTelegram(Context _context) { diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index 0f90c36..6f6b329 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": "

3.5.0

\n3dfx is back!", "cancellable": true, - "versionCodeBeta":"60", - "versionNameBeta":"3.5.6", - "versionNameBetas":"3.0.0,3.1.0,3.2.1,3.2.2,3.2.3,3.2.4,3.2.5,3.2.6,3.2.7,3.2.8,3.2.9,3.2.10,3.3.1,3.3.2,3.3.3,3.3.4,3.3.5,3.3.6,3.3.7,3.3.8,3.3.9,3.4.1,3.4.2,3.4.3,3.4.4,3.4.5,3.4.6,3.4.7,3.4.8,3.4.9,3.5.1,3.5.2,3.5.3,3.5.4,3.5.5,3.5.6", - "sizeBeta": "46 MB", + "versionCodeBeta":"61", + "versionNameBeta":"3.5.7", + "versionNameBetas":"3.0.0,3.1.0,3.2.1,3.2.2,3.2.3,3.2.4,3.2.5,3.2.6,3.2.7,3.2.8,3.2.9,3.2.10,3.3.1,3.3.2,3.3.3,3.3.4,3.3.5,3.3.6,3.3.7,3.3.8,3.3.9,3.4.1,3.4.2,3.4.3,3.4.4,3.4.5,3.4.6,3.4.7,3.4.8,3.4.9,3.5.1,3.5.2,3.5.3,3.5.4,3.5.5,3.5.6,3.5.7", + "sizeBeta": "43 MB", "urlBeta": "https://github.com/AnBui2004/Vectras-VM-Emu-Android/releases", - "MessageBeta": "

3.5.6

Bugs fixed.", + "MessageBeta": "

3.5.7

Bugs fixed.", "cancellableBeta": true }