Almond cake

This commit is contained in:
An Bui 2024-12-29 23:51:46 +07:00
parent a3892f7865
commit 0a8b24bff3
7 changed files with 31 additions and 38 deletions

View file

@ -602,6 +602,7 @@ public class MainActivity extends AppCompatActivity {
VectrasApp.killallqemuprocesses(getApplicationContext());
VectrasApp.deleteDirectory(AppConfig.vmFolder);
VectrasApp.deleteDirectory(AppConfig.recyclebin);
VectrasApp.deleteDirectory(AppConfig.romsdatajson);
File vDir = new File(AppConfig.maindirpath);
vDir.mkdirs();
errorjsondialog();

View file

@ -119,26 +119,28 @@ public class AdapterRoms extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
intent.putExtra("arch", current.itemArch);
RomsManagerActivity.activity.startActivity(intent);
//Save image to icon folder
myHolder.ivIcon.buildDrawingCache();
Bitmap bm = myHolder.ivIcon.getDrawingCache();
OutputStream fOut = null;
Uri outputFileUri;
try {
File root = new File(AppConfig.maindirpath + "/icons/");
root.mkdirs();
File sdImageMainDirectory = new File(root, current.itemPath + ".png");
outputFileUri = Uri.fromFile(sdImageMainDirectory);
fOut = new FileOutputStream(sdImageMainDirectory);
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
if (!current.itemPath.endsWith(".cvbi")) {
//Save image to icon folder
myHolder.ivIcon.buildDrawingCache();
Bitmap bm = myHolder.ivIcon.getDrawingCache();
OutputStream fOut = null;
Uri outputFileUri;
try {
File root = new File(AppConfig.maindirpath + "/icons/");
root.mkdirs();
File sdImageMainDirectory = new File(root, current.itemPath + ".png");
outputFileUri = Uri.fromFile(sdImageMainDirectory);
fOut = new FileOutputStream(sdImageMainDirectory);
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
try {
bm.compress(Bitmap.CompressFormat.PNG, 100, fOut);
fOut.flush();
fOut.close();
} catch (Exception e) {
try {
bm.compress(Bitmap.CompressFormat.PNG, 100, fOut);
fOut.flush();
fOut.close();
} catch (Exception e) {
}
}
}
});

View file

@ -52,7 +52,7 @@ public class VMManager {
VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", finalJson);
finalJson = new Gson().toJson(mapForCreateNewVM);
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "rom-data.json", finalJson);
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "rom-data.json", finalJson.replace("\\u003d", "="));
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "vmID.txt", Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString());
}
@ -78,7 +78,7 @@ public class VMManager {
finalJson = new Gson().toJson(listmapForCreateNewVM);
VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", finalJson);
finalJson = new Gson().toJson(mapForCreateNewVM);
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "rom-data.json", finalJson);
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "rom-data.json", finalJson.replace("\\u003d", "="));
VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "vmID.txt", Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString());
}
@ -296,11 +296,11 @@ public class VMManager {
_startRepeat++;
if (_startRepeat == _filelist.size()) {
if (!_result.isEmpty()) {
if (VectrasApp.checkJSONIsNormalFromString("[" + _result.replaceAll("u003d", "=") + "]")) {
if (VectrasApp.checkJSONIsNormalFromString("[" + _result + "]")) {
if (isFileExists(AppConfig.romsdatajson)) {
if (VectrasApp.checkJSONIsNormal(AppConfig.romsdatajson)) {
String _JSONcontent = VectrasApp.readFile(AppConfig.romsdatajson);
String _JSONcontentnew = _JSONcontent.replaceAll("]", _result.replaceAll("u003d", "=") + "]");
String _JSONcontentnew = _JSONcontent.replaceAll("]", _result + "]");
if (VectrasApp.checkJSONIsNormalFromString(_JSONcontentnew)) {
VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", _JSONcontentnew);
} else {
@ -372,8 +372,8 @@ public class VMManager {
if (VectrasApp.checkJSONIsNormal(AppConfig.romsdatajson)) {
String _JSONcontent = VectrasApp.readFile(AppConfig.romsdatajson);
String _JSONcontentnew = _JSONcontent.replaceAll("]", _result + "]");
if (VectrasApp.checkJSONIsNormalFromString(_JSONcontentnew.replaceAll("u003d", "="))) {
VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", _JSONcontentnew.replaceAll("u003d", "="));
if (VectrasApp.checkJSONIsNormalFromString(_JSONcontentnew)) {
VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", _JSONcontentnew);
} else {
restoredVMs = 0;
}

View file

@ -1,19 +1,13 @@
package com.vectras.vm;
import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale;
import static androidx.core.content.ContextCompat.getString;
import android.Manifest;
import android.app.Activity;
import android.app.Application;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@ -21,7 +15,6 @@ import android.graphics.Typeface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
@ -46,7 +39,6 @@ import com.google.android.material.color.DynamicColors;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.vectras.qemu.MainSettingsManager;
import com.vectras.vm.MainRoms.AdapterMainRoms;
import com.vectras.vm.utils.FileUtils;
import com.vectras.vterm.Terminal;
@ -56,7 +48,6 @@ import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@ -74,7 +65,6 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Objects;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
public class VectrasApp extends Application {