diff --git a/.gitignore b/.gitignore index bed986d..4895f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -431,3 +431,5 @@ jarsign.sh # Android NDK, build-tools /ndk/ /abt/ +com.aniplex.magireco.arm8.apk +test/ diff --git a/build.bat b/build.bat index 7ab037c..e7d1317 100644 --- a/build.bat +++ b/build.bat @@ -37,8 +37,10 @@ echo Applying smali patches... cd %~dp0 call git apply --stat "%~dp0\patches\NativeBridge.patch" call git apply --stat "%~dp0\patches\Hook.patch" +call git apply --stat "%~dp0\patches\Backtrace.patch" call git apply "%~dp0\patches\NativeBridge.patch" call git apply "%~dp0\patches\Hook.patch" +call git apply "%~dp0\patches\Backtrace.patch" echo Applying misc patches... REM call copy /Y "%~dp0\patches\images\story_ui_sprites00_patch.plist" "%~dp0\build\app\assets\package\story\story_ui_sprites00.plist" REM call copy /Y "%~dp0\patches\images\story_ui_sprites00_patch.png" "%~dp0\build\app\assets\package\story\story_ui_sprites00.png" diff --git a/build_release.bat b/build_release.bat index cb650d8..0609aea 100644 --- a/build_release.bat +++ b/build_release.bat @@ -37,8 +37,10 @@ echo Applying smali patches... cd %~dp0 call git apply --stat "%~dp0\patches\NativeBridge.patch" call git apply --stat "%~dp0\patches\Hook.patch" +call git apply --stat "%~dp0\patches\Backtrace.patch" call git apply "%~dp0\patches\NativeBridge.patch" call git apply "%~dp0\patches\Hook.patch" +call git apply "%~dp0\patches\Backtrace.patch" echo Applying misc patches... REM call copy /Y "%~dp0\patches\images\story_ui_sprites00_patch.plist" "%~dp0\build\app\assets\package\story\story_ui_sprites00.plist" REM call copy /Y "%~dp0\patches\images\story_ui_sprites00_patch.png" "%~dp0\build\app\assets\package\story\story_ui_sprites00.png" @@ -46,7 +48,7 @@ REM call copy /Y "%~dp0\patches\images\story_ui_sprites00_patch.png" "%~dp0\buil call copy /Y "%~dp0\patches\koruri-semibold.ttf" "%~dp0\build\app\assets\fonts\koruri-semibold.ttf" echo Updating sprites and AndroidManifest.xml... -call python buildassets.py +call python3 buildassets.py :build echo Copying new smali files... diff --git a/build_release.sh b/build_release.sh index 0ddef8e..739256f 100644 --- a/build_release.sh +++ b/build_release.sh @@ -68,8 +68,10 @@ _create() { echo "Applying smali patches..." git -C "${BASEDIR}" apply --stat "${BASEDIR}/patches/NativeBridge.patch" git -C "${BASEDIR}" apply --stat "${BASEDIR}/patches/Hook.patch" + git -C "${BASEDIR}" apply --stat "${BASEDIR}/patches/Backtrace.patch" git -C "${BASEDIR}" apply "${BASEDIR}/patches/NativeBridge.patch" git -C "${BASEDIR}" apply "${BASEDIR}/patches/Hook.patch" + git -C "${BASEDIR}" apply "${BASEDIR}/patches/Backtrace.patch" echo "Applying misc patches..." # cp "${BASEDIR}/patches/images/story_ui_sprites00_patch.plist" "${BASEDIR}/build/app/assets/package/story/story_ui_sprites00.plist" # cp "${BASEDIR}/patches/images/story_ui_sprites00_patch.png" "${BASEDIR}/build/app/assets/package/story/story_ui_sprites00.png" diff --git a/patches/Backtrace.patch b/patches/Backtrace.patch new file mode 100644 index 0000000..76c88d9 --- /dev/null +++ b/patches/Backtrace.patch @@ -0,0 +1,28 @@ +diff --git a/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali b/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali +index 6bc2d4d..67e0489 100644 +--- a/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali ++++ b/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali +@@ -6,9 +6,9 @@ + # static fields + .field private static final ANR_TIMEOUT:I = 0xbb8 + +-.field private static final ENDPOINT_URL:Ljava/lang/String; = "https://f4samurai.sp.backtrace.io:6098" ++.field private static final ENDPOINT_URL:Ljava/lang/String; = "https://walpurgisnacht.rayshift.io/backtrace" + +-.field private static final SUBMISSION_TOKEN:Ljava/lang/String; = "a798a9b785f35254cfee3086e38053e7597ba9a49cdcc8b0a90d64ef052786b6" ++.field private static final SUBMISSION_TOKEN:Ljava/lang/String; = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + + .field private static sBacktraceClient:Lbacktraceio/library/BacktraceClient; + +@@ -90,9 +90,9 @@ + :cond_0 + new-instance v0, Lbacktraceio/library/BacktraceCredentials; + +- const-string v1, "https://f4samurai.sp.backtrace.io:6098" ++ const-string v1, "https://walpurgisnacht.rayshift.io/backtrace" + +- const-string v2, "a798a9b785f35254cfee3086e38053e7597ba9a49cdcc8b0a90d64ef052786b6" ++ const-string v2, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + + invoke-direct {v0, v1, v2}, Lbacktraceio/library/BacktraceCredentials;->(Ljava/lang/String;Ljava/lang/String;)V + diff --git a/patches/Hook.patch b/patches/Hook.patch index 4db263d..9434a13 100644 --- a/patches/Hook.patch +++ b/patches/Hook.patch @@ -1,26 +1,12 @@ -diff --git a/build/app/smali/jp/f4samurai/MyApplication.smali b/build/app/smali/jp/f4samurai/MyApplication.smali +diff --git a/build/app/smali_classes2/jp/f4samurai/MyApplication.smali b/build/app/smali_classes2/jp/f4samurai/MyApplication.smali index 2a83c1d..c18fa78 100644 ---- "a/build/app/smali/jp/f4samurai/MyApplication.smali" -+++ "b/build/app/smali/jp/f4samurai/MyApplication.smali" +--- "a/build/app/smali_classes2/jp/f4samurai/MyApplication.smali" ++++ "b/build/app/smali_classes2/jp/f4samurai/MyApplication.smali" @@ -6,6 +6,7 @@ # direct methods .method public constructor ()V .locals 0 + invoke-static {}, Lcom/loadLib/libLoader;->loadLib()V - .line 12 + .line 9 invoke-direct {p0}, Landroid/app/Application;->()V -@@ -36,12 +37,7 @@ - .end method - - .method public onCreate()V -- .locals 1 -- -- const-string v0, "19418f5e-aacd-437e-af3e-2c9967abcb2f" -- -- .line 16 -- invoke-static {p0, v0}, Lcom/smrtbeat/SmartBeat;->initAndStartSession(Landroid/app/Application;Ljava/lang/String;)V -+ .locals 0 - - .line 17 - invoke-super {p0}, Landroid/app/Application;->onCreate()V diff --git a/patches/NativeBridge.patch b/patches/NativeBridge.patch index d0629f5..45b1b52 100644 --- a/patches/NativeBridge.patch +++ b/patches/NativeBridge.patch @@ -1,5 +1,5 @@ diff --git a/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali b/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali -index 0c7b0b1..c283cbc 100644 +index 6012fad..681a112 100644 --- a/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali +++ b/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali @@ -8,8 +8,6 @@ @@ -25,20 +25,58 @@ index 0c7b0b1..c283cbc 100644 .line 38 sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; -@@ -535,11 +526,8 @@ +@@ -535,11 +526,7 @@ .locals 1 - .line 183 + .line 181 - sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sCheatHandler:Ljp/f4samurai/bridge/CheatHandler; - - invoke-virtual {v0}, Ljp/f4samurai/bridge/CheatHandler;->isUnauthorizedUser()Z - - move-result v0 -+ + const v0, 0 return v0 .end method --- -2.7.4 - +@@ -630,13 +617,6 @@ + .locals 2 + + .line 121 +- sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; +- +- new-instance v1, Ljp/f4samurai/bridge/NativeBridge$2; +- +- invoke-direct {v1, p0}, Ljp/f4samurai/bridge/NativeBridge$2;->(Ljava/lang/String;)V +- +- invoke-virtual {v0, v1}, Ljp/f4samurai/AppActivity;->runOnUiThread(Ljava/lang/Runnable;)V + + return-void + .end method +@@ -645,13 +625,6 @@ + .locals 2 + + .line 130 +- sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; +- +- new-instance v1, Ljp/f4samurai/bridge/NativeBridge$3; +- +- invoke-direct {v1, p0, p1}, Ljp/f4samurai/bridge/NativeBridge$3;->(Ljava/lang/String;Ljava/lang/String;)V +- +- invoke-virtual {v0, v1}, Ljp/f4samurai/AppActivity;->runOnUiThread(Ljava/lang/Runnable;)V + + return-void + .end method +@@ -660,13 +633,6 @@ + .locals 2 + + .line 112 +- sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; +- +- new-instance v1, Ljp/f4samurai/bridge/NativeBridge$1; +- +- invoke-direct {v1, p0}, Ljp/f4samurai/bridge/NativeBridge$1;->(Ljava/lang/String;)V +- +- invoke-virtual {v0, v1}, Ljp/f4samurai/AppActivity;->runOnUiThread(Ljava/lang/Runnable;)V + + return-void + .end method diff --git a/src/Config.h b/src/Config.h index 7538ec5..b01c743 100644 --- a/src/Config.h +++ b/src/Config.h @@ -7,6 +7,6 @@ /************************** * Magia Translate Ver * **************************/ -#define MT_VERSION 114 +#define MT_VERSION 116 #endif \ No newline at end of file