Skip to content

Commit

Permalink
2.9.1 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@epicstudios856
epicstudios856 committed May 14, 2024
1 parent 14f9f51 commit 33a99e9
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 52 deletions.
8 changes: 4 additions & 4 deletions app/release/output-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 17,
"versionName": "v2.9.1",
"outputFile": "app-arm64-v8a-release.apk"
"outputFile": "app-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 17,
"versionName": "v2.9.1",
"outputFile": "app-x86_64-release.apk"
"outputFile": "app-arm64-v8a-release.apk"
}
],
"elementType": "File"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/vectras/qemu/MainSettingsManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,13 @@ public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

mHandler = new Handler();

Preference prefIfType = findPreference("ifType");
if (getArch(activity).equals("ARM64"))
if (prefIfType != null) {
prefIfType.setVisible(false);
}

Preference pref = findPreference("vmArch");
if (pref != null) {
pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/vectras/vm/CustomRomActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,16 +485,16 @@ public void onClick(View v) {
String defQemuParams;
switch (MainSettingsManager.getArch(MainActivity.activity)) {
case "ARM64":
defQemuParams = "-M virt -cpu cortex-a57 -smp 4 -netdev user,id=usernet -device virtio-net,netdev=usernet";
defQemuParams = "-M virt -cpu cortex-a57 -net nic,model=e1000 -net user -vga virtio -monitor stdio -device nec-usb-xhci -device usb-kbd -device usb-mouse -device VGA";
break;
case "PPC":
defQemuParams = "-M mac99 -cpu g3 -smp 4 -net nic -net user";
defQemuParams = "-M mac99 -cpu g3 -smp 1";
break;
case "I386":
defQemuParams = "-M pc -cpu qemu32,avx -accel tcg,thread=multi -smp 4 -vga std -netdev user,id=usernet -device e1000,netdev=usernet";
defQemuParams = "-M pc -cpu qemu32,+avx -accel tcg,thread=multi -smp 4 -vga std -netdev user,id=usernet -device e1000,netdev=usernet";
break;
default:
defQemuParams = "-M pc -cpu qemu64,avx -accel tcg,thread=multi -smp 4 -vga std -netdev user,id=usernet -device e1000,netdev=usernet";
defQemuParams = "-M pc -cpu qemu64,+avx -accel tcg,thread=multi -smp 4 -vga std -netdev user,id=usernet -device e1000,netdev=usernet";
break;
}
qemu.setText(defQemuParams);
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public void onClick(View v) {
imageSize.getText().toString() + "G", true, getActivity());
if (customRom)
CustomRomActivity.drive.setText(FileUtils.getExternalFilesDirectory(getActivity()).getPath() + "/QCOW2/" + imageName.getText().toString() + ".qcow2");
dismiss();
}
});

Expand Down
68 changes: 28 additions & 40 deletions app/src/main/java/com/vectras/vm/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class MainActivity extends AppCompatActivity {
private AdRequest adRequest;
public DrawerLayout mainDrawer;
private String TAG = "MainActivity";
public static /**/LinearLayout extVncLayout;
public static /**/ LinearLayout extVncLayout;
public static AppBarLayout appbar;
public TextView totalRam;
public TextView usedRam;
Expand Down Expand Up @@ -206,7 +206,8 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
int id = menuItem.getItemId();
if (id == R.id.navigation_item_info) {
startActivity(new Intent(activity, AboutActivity.class));
} if (id == R.id.navigation_item_help) {
}
if (id == R.id.navigation_item_help) {
String tw = AppConfig.vectrasWebsite;
Intent w = new Intent(Intent.ACTION_VIEW);
w.setData(Uri.parse(tw));
Expand Down Expand Up @@ -750,17 +751,6 @@ public static boolean checkSharedFolder() { //TODO: not work idk why
}

public static void startVM(String vmName, String env) {
if (checkSharedFolder()) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle("Large File Detected");
builder.setMessage("One or more files in this folder are larger than 500MB, " +
"due qemu limits you can't use shared folder that's contains files larger than 500mb, " +
"please disable shared folder Settings>qemu or free some files from shared folder.");
builder.setPositiveButton("OK", (dialogInterface, i) -> dialogInterface.dismiss());
builder.create().show();
return;
}

boolean isRunning = isMyServiceRunning(MainService.class);

ProgressDialog progressDialog = new ProgressDialog(activity, R.style.MainDialogTheme);
Expand All @@ -770,41 +760,39 @@ public static void startVM(String vmName, String env) {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
public void run() {
if (!isRunning) {
Intent serviceIntent = new Intent(activity, MainService.class);
MainService.env = env;
MainService.CHANNEL_ID = vmName;
if (SDK_INT >= Build.VERSION_CODES.O) {
activity.startForegroundService(serviceIntent);
} else {
activity.startService(serviceIntent);
}

if (MainSettingsManager.getVmUi(activity).equals("VNC")) {
if (MainSettingsManager.getVncExternal(MainActivity.activity)) {
extVncLayout.setVisibility(View.VISIBLE);
appbar.setExpanded(true);
} else {
activity.startActivity(new Intent(activity, MainVNCActivity.class));
}
} else if (MainSettingsManager.getVmUi(activity).equals("SPICE")) {
//activity.startActivity(new Intent(activity, RemoteCanvasActivity.class));
} else if (MainSettingsManager.getVmUi(activity).equals("X11")) {
//activity.startActivity(new Intent(activity, X11Activity.class));
}

progressDialog.dismiss();
Intent serviceIntent = new Intent(activity, MainService.class);
MainService.env = env;
MainService.CHANNEL_ID = vmName;
if (SDK_INT >= Build.VERSION_CODES.O) {
activity.startForegroundService(serviceIntent);
} else {
progressDialog.dismiss();
activity.startService(serviceIntent);
}

if (MainSettingsManager.getVmUi(activity).equals("VNC")) {
if (MainSettingsManager.getVncExternal(MainActivity.activity)) {
extVncLayout.setVisibility(View.VISIBLE);
appbar.setExpanded(true);
progressDialog.dismiss();
} else {
activity.startActivity(new Intent(activity, MainVNCActivity.class));
progressDialog.show();
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
public void run() {
MainVNCActivity.started = true;
activity.startActivity(new Intent(activity, MainVNCActivity.class));
progressDialog.dismiss();
}
}, 2000);
}
} else if (MainSettingsManager.getVmUi(activity).equals("SPICE")) {
//activity.startActivity(new Intent(activity, RemoteCanvasActivity.class));
} else if (MainSettingsManager.getVmUi(activity).equals("X11")) {
//activity.startActivity(new Intent(activity, X11Activity.class));
}

}
}, 5000);
}, 2000);
String[] params = env.split("\\s+");
VectrasStatus.logInfo("Params:");
Log.d("StartVM", "Params:");
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/com/vectras/vm/StartVM.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ else if (MainSettingsManager.getArch(activity).equals("ARM64"))
else if (MainSettingsManager.getArch(activity).equals("PPC"))
params.add("qemu-system-ppc");

String ifType = MainSettingsManager.getIfType(activity);
String ifType;
if (MainSettingsManager.getArch(activity).equals("ARM64"))
ifType = "ahci";
else
ifType= MainSettingsManager.getIfType(activity);

String cdrom;
String hdd1;
Expand Down Expand Up @@ -128,10 +132,10 @@ else if (MainSettingsManager.getArch(activity).equals("PPC"))
}

params.add("-monitor");
if (MainSettingsManager.getArch(activity).equals("X86_64"))
params.add("vc");
else if (MainSettingsManager.getArch(activity).equals("ARM64"))
if (MainSettingsManager.getArch(activity).equals("ARM64"))
params.add("stdio");
else
params.add("vc");
} else if (MainSettingsManager.getVmUi(activity).equals("SPICE")) {
String spiceStr = "-spice ";
spiceStr += "port=6999,disable-ticketing=on";
Expand Down

0 comments on commit 33a99e9

Please sign in to comment.