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

getting to release 2.8.5

Browse source
This commit is contained in:
Epic Studios 2024-04-19 00:24:00 +02:00
parent 914375c8ed
commit d3a34ff81d
5 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/android/androidVNC/RfbProto.java
View file

@ -314,7 +314,7 @@ public class RfbProto {
//
LocalSocket localSocket = null;
public static boolean allow_external = true;
public static boolean allow_external = false;
//-RfbProto(String h, int p, VncViewer v) throws IOException {
RfbProto(String h, int p) throws IOException{

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

@ -628,10 +628,7 @@ public class MainActivity extends AppCompatActivity {
public void run() {
if (!isRunning) {
Intent serviceIntent = new Intent(activity, MainService.class);
if (MainSettingsManager.getVmUi(activity).equals("X11"))
MainService.env = "dwm; " + env;
else
MainService.env = env;
MainService.env = env;
MainService.CHANNEL_ID = vmName;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
activity.startForegroundService(serviceIntent);

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

@ -49,7 +49,6 @@ public class MainService extends Service {
Terminal vterm = new Terminal(this);
//vterm.executeShellCommand("chmod 770 /run/pulse -R");
//vterm.executeShellCommand("pulseaudio --system --disallow-exit --disallow-module-loading --daemonize --log-level=debug --log-time=1");
vterm.executeShellCommand("vncserver :1");
vterm.executeShellCommand(env);
}
} else

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

@ -69,10 +69,10 @@ public class StartVM {
params.add(hdd2);
}
if (MainSettingsManager.getSharedFolder(activity)) {
/*if (MainSettingsManager.getSharedFolder(activity)) {
params.add("-net user,smb='" + FileUtils.getExternalFilesDirectory(activity).getPath() + "/SharedFolder" + "'");
params.add("-net nic,model=virtio");
}
}*/
boolean kvm = MainSettingsManager.getKvm(activity);
boolean avx = MainSettingsManager.getAvx(activity);
@ -133,12 +133,25 @@ public class StartVM {
if (MainSettingsManager.getVmUi(activity).equals("VNC")) {
String vncStr = "-vnc ";
//params.add(vncStr);
params.add(vncStr);
// Allow connections only from localhost using localsocket without a password
//params.add(Config.defaultVNCHost+":" + Config.defaultVNCPort);
String qmpParams = "unix:";
qmpParams += Config.getLocalVNCSocketPath();
//params.add(qmpParams);
params.add(qmpParams);
params.add("-monitor");
params.add("vc");
//XXX: monitor, serial, and parallel display crashes cause SDL doesn't support more than 1 window
params.add("-monitor");
params.add("none");
params.add("-serial");
params.add("none");
params.add("-parallel");
params.add("none");
} else if (MainSettingsManager.getVmUi(activity).equals("SPICE")) {
String spiceStr = "-spice ";
spiceStr += "port=6999,disable-ticketing=on";
@ -146,19 +159,6 @@ public class StartVM {
} else if (MainSettingsManager.getVmUi(activity).equals("X11")) {
}
params.add("-monitor");
params.add("vc");
//XXX: monitor, serial, and parallel display crashes cause SDL doesn't support more than 1 window
params.add("-monitor");
params.add("none");
params.add("-serial");
params.add("none");
params.add("-parallel");
params.add("none");
params.add("-k");
params.add("en-us");