From 2b10a12b5392e81c9ab211727ede08c6d11d730f Mon Sep 17 00:00:00 2001 From: kuhakupixel Date: Thu, 7 Sep 2023 13:47:23 +0700 Subject: [PATCH 1/4] Add default port for Connect to ACE Server --- .../java/com/kuhakupixel/atg/backend/ACEPort.java | 12 ++++++++++++ .../com/kuhakupixel/atg/ui/OverlayInputDialog.kt | 3 ++- .../main/java/com/kuhakupixel/atg/ui/menu/Process.kt | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACEPort.java diff --git a/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACEPort.java b/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACEPort.java new file mode 100644 index 000000000..803727df1 --- /dev/null +++ b/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACEPort.java @@ -0,0 +1,12 @@ +package com.kuhakupixel.atg.backend; + +public class ACEPort { + /* + * if we can, we start ACE server on port found by the apk + * + * however its not possible for non rooted method where the apk + * starts its own service via its own port + * */ + public static int defaultPort = 56666; + public static int defaultStatusPublisherPort = 56667; +} diff --git a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/OverlayInputDialog.kt b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/OverlayInputDialog.kt index e52b720ed..37a3edf17 100644 --- a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/OverlayInputDialog.kt +++ b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/OverlayInputDialog.kt @@ -26,7 +26,8 @@ class OverlayInputDialog( ) } - fun show(title: String, onConfirm: (input: String) -> Unit) { + fun show(title: String, defaultValue: String = "", onConfirm: (input: String) -> Unit) { + this.valueInput.value = defaultValue super.show( title = title, onConfirm = { diff --git a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/Process.kt b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/Process.kt index 86596553d..da7ea4e0e 100644 --- a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/Process.kt +++ b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/Process.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.kuhakupixel.atg.R import com.kuhakupixel.atg.backend.ACE +import com.kuhakupixel.atg.backend.ACEPort import com.kuhakupixel.atg.backend.ProcInfo import com.kuhakupixel.atg.ui.GlobalConf import com.kuhakupixel.atg.ui.util.CreateTable @@ -252,6 +253,7 @@ fun ProcessMenu(globalConf: GlobalConf?, overlayContext: OverlayContext?) { OverlayInputDialog(overlayContext!!).show( "Port: ", + defaultValue = ACEPort.defaultPort.toString(), onConfirm = { input: String -> val port = input.toInt() if (ace.IsAttached()) From e7fafcd238b69848273a6188fc48f445be2c9800 Mon Sep 17 00:00:00 2001 From: kuhakupixel Date: Thu, 7 Sep 2023 13:52:52 +0700 Subject: [PATCH 2/4] ATG: cleanup and add TODO --- ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACE.java | 1 + .../src/main/java/com/kuhakupixel/atg/ui/menu/MemoryUtil.kt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACE.java b/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACE.java index 280836c9a..441758301 100644 --- a/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACE.java +++ b/ATG/app/src/main/java/com/kuhakupixel/atg/backend/ACE.java @@ -154,6 +154,7 @@ private synchronized void AssertNoAttachInARow() { throw new AttachingInARowException("Cannot Attach without DeAttaching first"); } + // TODO: add statusPublisherPort as parameter public synchronized void ConnectToACEServer(Integer port) throws IOException, InterruptedException { AssertNoAttachInARow(); this.aceAttachClient = new ACEAttachClient(port); diff --git a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/MemoryUtil.kt b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/MemoryUtil.kt index 6489cde2d..ebe905a3e 100644 --- a/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/MemoryUtil.kt +++ b/ATG/app/src/main/java/com/kuhakupixel/atg/ui/menu/MemoryUtil.kt @@ -32,10 +32,6 @@ fun onNextScanClicked( onBeforeScanStart() val statusPublisherPort = ace.getStatusPublisherPort() CompletableFuture.supplyAsync { - // This simulates an expensive operation - Thread.sleep(1000) - "Hello, world!" - // set the value type if (!scanOptions.initialScanDone) ace.SetNumType(scanOptions.numType) /** From 652e04068b6c787cd8ab9472fce53c4298b98268 Mon Sep 17 00:00:00 2001 From: kuhakupixel Date: Thu, 7 Sep 2023 15:32:46 +0700 Subject: [PATCH 3/4] README.md: Update doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d6e0276d..c800995f6 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ after download, you should have folder called `online.limitless.appleknight.free` #### Attaching memory scanner ``` -./modder patch online.limitless.appleknight.free/ true +./modder patch online.limitless.appleknight.free/ ``` this will take a while since it has to recompile, attach memory scanner, recompile and resign the apk From 7af1102b920fe811a96679d38ada4ae48e36e28d Mon Sep 17 00:00:00 2001 From: kuhakupixel Date: Thu, 7 Sep 2023 15:52:22 +0700 Subject: [PATCH 4/4] add changelog --- changelog.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/changelog.md b/changelog.md index 9763c6f95..987f11834 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,19 @@ # ChangeLog +## [0.1.1] + +### Fixed +- [Modder] installation fails when Apk's `AndroidManifests.xml` 's `extractNativeLib=false` +- [Modder] patch fails with exception `can't find launchable activity` because of + using `aapt1` instead of `aapt2` + +### Added +- [APK] add default port when pressing `Connect to ACE's server` +- [Modder] `sign` command to sign apk + +### Changed +- [Modder] simplify `patch` command + +### Removed ## [0.1.0]