Merge legacy and latest

GPXViewer2/GPXViewer2.plist

@@ -1,7 +1,7 @@
 {
 	Filter = {
 		Bundles = (
-			"tech.baye.servercat",
+			"family.gander.gpxviewer2",
 		);
 	};
 }

GPXViewer2/Makefile

@@ -0,0 +1,13 @@
+TARGET = iphone:latest:14.0
+INSTALL_TARGET_PROCESSES = gpxviewer2
+ARCHS = arm64
+
+include $(THEOS)/makefiles/common.mk
+
+TWEAK_NAME = GPXViewer2
+
+GPXViewer2_FILES = Tweak.x
+GPXViewer2_CFLAGS = -fobjc-arc
+GPXViewer2_FRAMEWORKS = Foundation UIKit
+
+include $(THEOS_MAKE_PATH)/tweak.mk

GPXViewer2/Tweak.x

@@ -0,0 +1,53 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <CommonCrypto/CommonCrypto.h>
+#import <CloudKit/CloudKit.h>
+#import <mach-o/dyld.h>
+#import <string.h>
+
+%hook CKContainer
++ (id)defaultContainer { return nil; }
++ (id)containerWithIdentifier:(id)arg1 { return nil; }
+%end
+
+%ctor {
+    @autoreleasepool {
+        // Device UUID
+        NSString *deviceUUID = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
+        if (!deviceUUID) deviceUUID = @"<no-device-uuid>";
+
+        // Compute SHA256 hashes for all product keys
+        NSString *salt = @"-gpxviewerbyjg-";
+        NSArray *productKeys = @[
+            // @"family.gander.gpxviewer2.iap.nc.coffee",
+            // @"family.gander.gpxviewer2.iap.nc.hikingsnack",
+            @"family.gander.gpxviewer2.iap.nc.hikingmeal",
+            // @"family.gander.gpxviewer2.easteregg.secret.access",
+            // @"family.gander.gpxviewer2.iap.nc.level1",
+            // @"family.gander.gpxviewer2.iap.nc.level2",
+            // @"family.gander.gpxviewer2.iap.nc.level3",
+        ];
+
+        NSMutableArray *hashes = [NSMutableArray array];
+        for (NSString *key in productKeys) {
+            NSString *input = [NSString stringWithFormat:@"%@%@%@", deviceUUID, salt, key];
+            const char *cstr = [input UTF8String];
+            unsigned char digest[CC_SHA256_DIGEST_LENGTH];
+            CC_SHA256(cstr, (CC_LONG)strlen(cstr), digest);
+            NSMutableString *hex = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2];
+            for (NSUInteger i = 0; i < CC_SHA256_DIGEST_LENGTH; i++) {
+                [hex appendFormat:@"%02x", digest[i]];
+            }
+            [hashes addObject:hex];
+        }
+
+        // // empty hashes array
+        // NSMutableArray *hashes = [NSMutableArray array];
+
+        [[NSUserDefaults standardUserDefaults] setObject:hashes
+                                                  forKey:@"proversionmanager.storage.purchasedproducts"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+
+        NSLog(@"[GPXViewer2] Injected %lu product hashes", (unsigned long)[hashes count]);
+    }
+}

GPXViewer2/control

@@ -0,0 +1,9 @@
+Package: com.rev.gpxviewer2unlock
+Name: GPXViewer2 Unlock
+Version: 1.0
+Architecture: iphoneos-arm
+Description: Unlock all IAP products and easter egg in GPXViewer 2
+Maintainer: rev
+Author: rev
+Section: Tweaks
+Depends: firmware (>= 14.0)

README.md

@@ -6,8 +6,7 @@ iOS tweaks built with [Theos](https://theos.dev), injected into IPAs via [cyan](
 
 | Tweak                                                   | App              | Target     |
 | ------------------------------------------------------- | ---------------- | ---------- |
-| [ServerCatPremium](ServerCatPremium/index.md)           | ServerCat 1.30.0 | iOS 17+    |
-| [ServerCatPremium (legacy)](ServerCatPremium_/index.md) | ServerCat 1.6.4  | iOS 15     |
+| [ServerCatPremium](ServerCatPremium/index.md)           | ServerCat 1.30.0 / 1.6.4 | iOS 15+    |
 | [TextasticPro](TextasticPro/index.md)                   | Textastic 10.9.2 | iOS 18+    |
 | [BusinessJB](BusinessJB/index.md)                       | Business 2.3.000 | iOS 15     |
 | [CreditAgricoleJB](CreditAgricoleJB/index.md)           | Ma Banque 47.0.0 | iOS 15.8.6 |

ServerCatPremium/Tweak.x

@@ -5,7 +5,16 @@
 
 #define TARGET_MODULE       "ServerCat"
 #define IDA_BASE            0x100000000
-#define ADDR_IS_PREMIUM     0x10009CD24  // Address of "isPremiumActive" in IDA (adjust if needed)
+
+/*
+ * EDIT THE HOOK ADDRESS OFFSET ACCORDING TO THE APP VERSION USED:
+ *
+ * ServerCat 1.30.0 (latest)  -> 0x10009CD24
+ * ServerCat 1.6.4  (legacy)  -> 0x100454D70
+ *
+ * Find the address of `isPremiumActive` in IDA and set it below.
+ */
+#define ADDR_IS_PREMIUM     0x10009CD24
 
 static int (*orig_isPremiumActive)(void);
 
@@ -26,7 +35,7 @@ static int hook_isPremiumActive(void) {
     }
 }
 
-// iOS 16 Crash Fix
+// iOS 16+ Crash Fix
 %hook CKContainer
 + (id)defaultContainer {
     return nil;
@@ -34,4 +43,4 @@ static int hook_isPremiumActive(void) {
 + (id)containerWithIdentifier:(id) arg1 {
     return nil;
 }
-%end
+%end

ServerCatPremium/index.md

@@ -1,9 +1,13 @@
 # ServerCatPremium
 
-Unlocks premium features in ServerCat by forcing `isPremiumActive` (`sub_10009CD24`) to always return `1`.
+Unlocks premium features in ServerCat by forcing `isPremiumActive` to always return `1`.
 
 - **App**: [ServerCat – SSH Terminal](https://apps.apple.com/us/app/servercat-ssh-terminal/id1501532023)
-- **Tested on**: ServerCat 1.30.0 (600), iOS 18.3
+- **Tested on**: ServerCat 1.30.0 (iOS 18.3) and ServerCat 1.6.4 (iOS 15.8.6)
+
+Hook address offsets (edit in `Tweak.x`):
+- `0x10009CD24` — ServerCat 1.30.0
+- `0x100454D70` — ServerCat 1.6.4
 
 ## Build
 
@@ -14,12 +18,9 @@ make clean && make package THEOS_PACKAGE_SCHEME=rootless DEBUG=0
 ## Inject
 
 ```sh
-cyan -i tech.baye.servercat-1.30.0.ipa \
-     -o tech.baye.servercat-1.30.0_patched.ipa \
-     -f xyz.nohamr_1.0.0-1_iphoneos-arm64.deb \
-     -u
+cyan -i <input.ipa> -o <output_patched.ipa> -f xyz.nohamr_1.0.0-1_iphoneos-arm64.deb -u
 ```
 
 ## Screenshots
 ![../docs/screens/ServerCatPremium/menu.png](../docs/screens/ServerCatPremium/menu.png)
-![../docs/screens/ServerCatPremium/menu2.png](../docs/screens/ServerCatPremium/menu2.png)
+![../docs/screens/ServerCatPremium/menu2.png](../docs/screens/ServerCatPremium/menu2.png)

ServerCatPremium_/Makefile

@@ -1,13 +0,0 @@
-TARGET = iphone:latest:14.0
-INSTALL_TARGET_PROCESSES = ServerCat
-ARCHS = arm64 arm64e
-
-include $(THEOS)/makefiles/common.mk
-
-TWEAK_NAME = ServerCatPremium
-
-ServerCatPremium_FILES = Tweak.x
-ServerCatPremium_CFLAGS = -fobjc-arc
-ServerCatPremium_FRAMEWORKS = Foundation
-
-include $(THEOS_MAKE_PATH)/tweak.mk

ServerCatPremium_/Tweak.x

@@ -1,27 +0,0 @@
-#import <substrate.h>
-#import <mach-o/dyld.h>
-#import <string.h>
-#import <Foundation/Foundation.h>
-
-#define TARGET_MODULE       "ServerCat"
-#define IDA_BASE            0x100000000
-#define ADDR_IS_PREMIUM     0x100454D70  // Address of "isPremiumActive" in IDA (adjust if needed)
-
-static int (*orig_isPremiumActive)(void);
-
-static int hook_isPremiumActive(void) {
-    return 1;
-}
-
-%ctor {
-    for (uint32_t i = 0; i < _dyld_image_count(); i++) {
-        const char *name = _dyld_get_image_name(i);
-        if (name && strstr(name, TARGET_MODULE)) {
-            uintptr_t base = (uintptr_t)_dyld_get_image_header(i);
-            uintptr_t addr = base + (ADDR_IS_PREMIUM - IDA_BASE);
-            MSHookFunction((void *)addr, (void *)hook_isPremiumActive, (void **)&orig_isPremiumActive);
-            NSLog(@"[ServerCatPremium] Hooked isPremiumActive at 0x%lx", addr);
-            return;
-        }
-    }
-}

ServerCatPremium_/control

@@ -1,9 +0,0 @@
-Package: xyz.nohamr.servercatpremiumlegacy
-Name: ServerCatPremium (Legacy)
-Version: 1.0.0
-Architecture: iphoneos-arm
-Description: Unlocks premium features in ServerCat app.
-Maintainer: NohamR
-Author: NohamR
-Section: Tweaks
-Depends: mobilesubstrate (>= 0.9.5000)

ServerCatPremium_/index.md

@@ -1,26 +0,0 @@
-# ServerCatPremium (legacy — iOS 15)
-
-Unlocks premium features in ServerCat by forcing `isPremiumActive` (`sub_100454D70`) to always return `1`.
-
-- **App**: [ServerCat – SSH Terminal](https://apps.apple.com/us/app/servercat-ssh-terminal/id1501532023)
-- **Tested on**: ServerCat 1.6.4, iOS 15.8.6
-- **Note**: ServerCat 1.6.4 is the last version supporting iOS 15. Latest requires iOS 17+.
-
-## Build
-
-```sh
-make clean && make package THEOS_PACKAGE_SCHEME=rootless DEBUG=0
-```
-
-## Inject
-
-```sh
-cyan -i tech.baye.servercat-1.6.4.ipa \
-     -o tech.baye.servercat-1.6.4_patched.ipa \
-     -f xyz.nohamr_1.0.0-1_iphoneos-arm64.deb \
-     -u
-```
-
-## Screenshots
-![../docs/screens/ServerCatPremium_/menu.png](../docs/screens/ServerCatPremium_/menu.png)
-![../docs/screens/ServerCatPremium_/menu2.png](../docs/screens/ServerCatPremium_/menu2.png)