mirror of
https://github.com/xoureldeen/Vectras-VM-Android.git
synced 2026-05-19 16:42:13 +00:00
3.5.7
- Fixed the crash issue when shutting down VM. - Fixed the crash issue when the Create command call to Vectras VM.
This commit is contained in:
parent
e3dc8ff5b6
commit
0b39a23695
4 changed files with 20 additions and 29 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
"url": "https://github.com/xoureldeen/Vectras-VM-Android/releases",
|
||||
"Message": "<h2>3.5.0</h2>\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": "<h2>3.5.6</h2>Bugs fixed.",
|
||||
"MessageBeta": "<h2>3.5.7</h2>Bugs fixed.",
|
||||
"cancellableBeta": true
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue