Skip to content

Commit 1fb6dee

Browse files
ComputerEliteComputerElite
authored andcommitted
removel logging, delete mods on apk install
1 parent 7a82a99 commit 1fb6dee

5 files changed

Lines changed: 18 additions & 12 deletions

File tree

QuestAppVersionSwitcher/APKSigner.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ internal PrePatchHash(string hash, DateTimeOffset lastModified)
208208
}
209209

210210
result[entryName] = new PrePatchHash(digest, entry.LastWriteTime);
211-
Logger.Log($"Added hash {digest} for {entryName}");
211+
//Logger.Log($"Added hash {digest} for {entryName}");
212212

213213
// Skip the newline after each entry.
214214
await manifestReader.ReadLineAsync();
@@ -502,12 +502,12 @@ public static async Task WriteEntryHash(ZipArchiveEntry entry, Stream manifestSt
502502
prePatchHashes.TryGetValue(entry.FullName, out var prePatchHash) &&
503503
entry.LastWriteTime == prePatchHash.LastModified)
504504
{
505-
Logger.Log("Using existing hash for " + entry.FullName);
505+
//Logger.Log("Using existing hash for " + entry.FullName);
506506
hash = prePatchHash.Hash;
507507
}
508508
else
509509
{
510-
Logger.Log("Hashing " + entry.FullName);
510+
//Logger.Log("Hashing " + entry.FullName);
511511
await using Stream sourceStream = entry.Open();
512512
hash = Convert.ToBase64String(Sha.ComputeHash(sourceStream));
513513
}

QuestAppVersionSwitcher/Mods/QAVSModManager.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.IO;
66
using System.Linq;
77
using System.Text.Json;
8+
using ComputerUtils.Android;
89
using ComputerUtils.Android.FileManaging;
910
using ComputerUtils.Android.Webserver;
1011
using Java.Lang;
@@ -357,11 +358,15 @@ public static byte[] GetModCover(string id)
357358

358359
public static void DeleteAllMods()
359360
{
360-
FileManager.RecreateDirectoryIfExisting(modManager.ModsExtractPath);
361-
FolderPermission.DeleteDirectoryContent(modManager.ModsPath);
362-
FolderPermission.DeleteDirectoryContent(modManager.LibsPath);
363-
File.Delete(modManager.ConfigPath);
364-
modManager.Reset();
361+
GeneralPurposeWorker.ExecuteWork(() =>
362+
{
363+
Logger.Log("Haha mods go brrrr, yeeeeeeeeeeeeeeeeeeeeeeeeeeet. We doin this on a background thread, hell yeah.");
364+
FileManager.RecreateDirectoryIfExisting(modManager.ModsExtractPath);
365+
FolderPermission.DeleteDirectoryContent(modManager.ModsPath);
366+
FolderPermission.DeleteDirectoryContent(modManager.LibsPath);
367+
File.Delete(modManager.ConfigPath);
368+
modManager.Reset();
369+
});
365370
}
366371
}
367372
}

QuestAppVersionSwitcher/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.8" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="91">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.9" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="92">
33
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="32" />
44
<uses-permission android:name="oculus.permission.handtracking" />
55
<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

QuestAppVersionSwitcher/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
// Minor Version
2323
// Build Number
2424
// Revision
25-
[assembly: AssemblyVersion("1.13.8.0")]
26-
[assembly: AssemblyFileVersion("1.13.8.0")]
25+
[assembly: AssemblyVersion("1.13.9.0")]
26+
[assembly: AssemblyFileVersion("1.13.9.0")]

QuestAppVersionSwitcher/WebServer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,8 @@ public void Start()
10281028

10291029
Logger.Log("Installing apk of backup " + backupname + " of " + package);
10301030
AndroidService.InitiateInstallApk(backupDir + "app.apk");
1031-
serverRequest.SendString(GenericResponse.GetResponse("Started apk install", true), "application/json");
1031+
serverRequest.SendString(GenericResponse.GetResponse("Started apk install. Deleting existing mods in parallel", true), "application/json");
1032+
QAVSModManager.DeleteAllMods();
10321033
return true;
10331034
});
10341035
server.AddRoute("GET", "/api/backupinfo", serverRequest =>

0 commit comments

Comments
 (0)