vrr/Vectras-VM-Android
2
0
Fork 0
mirror of https://github.com/xoureldeen/Vectras-VM-Android.git synced 2026-05-02 16:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2.9.1 Update

Browse source
This commit is contained in:
epicstudios856 2024-05-14 23:58:22 +03:00
parent 14f9f51739
commit 33a99e9596
6 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/vectras/qemu/MainSettingsManager.java
View file

@ -255,6 +255,13 @@ public class MainSettingsManager extends AppCompatActivity
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() {

8
app/src/main/java/com/vectras/vm/CustomRomActivity.java
View file

@ -485,16 +485,16 @@ public class CustomRomActivity extends AppCompatActivity {
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);

1
app/src/main/java/com/vectras/vm/Fragment/CreateImageDialogFragment.java
View file

@ -95,6 +95,7 @@ public class CreateImageDialogFragment extends DialogFragment {
imageSize.getText().toString() + "G", true, getActivity());
if (customRom)
CustomRomActivity.drive.setText(FileUtils.getExternalFilesDirectory(getActivity()).getPath() + "/QCOW2/" + imageName.getText().toString() + ".qcow2");
dismiss();
}
});

68
app/src/main/java/com/vectras/vm/MainActivity.java
View file

@ -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;
@ -206,7 +206,8 @@ public class MainActivity extends AppCompatActivity {
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));
@ -750,17 +751,6 @@ public class MainActivity extends AppCompatActivity {
}
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);
@ -770,41 +760,39 @@ public class MainActivity extends AppCompatActivity {
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:");

12
app/src/main/java/com/vectras/vm/StartVM.java
View file

@ -34,7 +34,11 @@ public class StartVM {
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;
@ -128,10 +132,10 @@ public class StartVM {
}
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";