Merge pull request #3 from asdfzxcvbn/main

v1.1

Makefile

@@ -7,7 +7,8 @@ include $(THEOS)/makefiles/common.mk
 TWEAK_NAME = EeveeSpotify
 
 $(TWEAK_NAME)_FILES = $(shell find src -name '*.m' -o -name '*.x')
-$(TWEAK_NAME)_CFLAGS = -fobjc-arc -Wno-unused-variable
+$(TWEAK_NAME)_CFLAGS = -fobjc-arc
+$(TWEAK_NAME)_FRAMEWORKS = UIKit
 $(TWEAK_NAME)_LOGOS_DEFAULT_GENERATOR = internal
 
 include $(THEOS_MAKE_PATH)/tweak.mk

README.md

@@ -6,4 +6,7 @@ This branch contains the same tweak but rewritten in Objective-C by [asdfzxcvbn]
 
 After looking into it, I discovered that Orion is not the problem. Instead [pyzule](https://github.com/asdfzxcvbn/pyzule) wasn't injecting CydiaSubstrate for unknown reasons, resulting in ipa crashes.
 
-However, the Objective-C version isn't stable. You might need to restart the app a lot to get Premium. Therefore, it's better to use the Swift version.
+
+~~However, the Objective-C version isn't stable. You might need to restart the app a lot to get Premium. Therefore, it's better to use the Swift version.~~
+
+After updating the Objective-C version, it should be just as stable as the Swift version. However, your results may vary, so you should try both if one isn't working for you.

control

@@ -1,9 +1,9 @@
 Package: com.eevee.spotify
 Name: EeveeSpotify
-Version: 1.0
+Version: 1.1
 Architecture: iphoneos-arm
 Description: A tweak to get Spotify Premium for free, just like Spotilife
 Maintainer: Eevee
 Author: Eevee
 Section: Tweaks
-Depends: ${ORION}, firmware (>= 14.0)
+Depends: firmware (>= 15.0)

src/EVEBundleHelper.h

@@ -1,8 +1,11 @@
-#import <Foundation/Foundation.h>
-#import <libroot.h>
+#import <UIKit/UIKit.h>
 
 @interface EVEBundleHelper : NSObject
 @property (nonatomic, strong, readonly) NSBundle *bundle;
 + (instancetype)sharedHelper;
 - (NSData *)premiumBlankData;
+- (void)showPopupWithTitle:(NSString *)title message:(NSString *)msg buttonText:(NSString *)bText;
+@end
+
+@interface UITabBarButtonLabel : UILabel
 @end

src/EVEBundleHelper.m

@@ -1,4 +1,5 @@
 #import "EVEBundleHelper.h"
+#import <libroot.h>
 
 @implementation EVEBundleHelper
 @synthesize bundle = _bundle;
@@ -30,4 +31,21 @@ - (instancetype)init {
 - (NSData *)premiumBlankData {
     return [NSData dataWithContentsOfURL:[self.bundle URLForResource:@"premiumblank" withExtension:@"bnk"]];
 }
+
+- (void)showPopupWithTitle:(NSString *)title message:(NSString *)msg buttonText:(NSString *)bText {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:title
+                                message:msg
+                                preferredStyle:UIAlertControllerStyleAlert];
+
+            [alert addAction:[UIAlertAction actionWithTitle:bText
+                                style:UIAlertActionStyleDefault
+                                handler:nil]];
+
+            [UIApplication.sharedApplication.delegate.window.rootViewController
+                        presentViewController:alert animated:YES completion:nil];
+        });
+    });
+}
 @end

src/SpotifyHidePremium.x

@@ -0,0 +1,20 @@
+#import "EVEBundleHelper.h"
+
+%hook UITabBar
+- (NSArray *)items {
+    return [%orig subarrayWithRange:NSMakeRange(0, 3)];  // there is only one UITabBar, so no problem
+}
+%end
+
+// this method is called quite a lot, but only when you switch tabs, so it's fine i guess
+%hook UITabBarButtonLabel
+- (NSString *)text {
+    NSString *t = %orig;
+
+    // comment while open sourcing: i originally thought i fucked up because "Premium" wouldn't match other languages.
+    // however somehow this actually does work? for all languages?? weird, but whatever, no complaints lmao
+    if ([t isEqualToString:@"Premium"]) [self.superview removeFromSuperview];
+
+    return t;
+}
+%end

src/Tweak.x

@@ -10,31 +10,53 @@
 %end
 
 %hook AppDelegate
-- (BOOL)application:(id)app didFinishLaunchingWithOptions:(id)opts {
+- (BOOL)application:(id)app willFinishLaunchingWithOptions:(id)opts {
     %orig(app, opts);
 
     @try {
         NSArray<NSURL *> *fileURLs = [[NSFileManager defaultManager] 
                                         URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask];
         NSURL *filePath = [fileURLs.firstObject URLByAppendingPathComponent:@"PersistentCache/offline.bnk"];
 
-        if ([[NSFileManager defaultManager] fileExistsAtPath:filePath.path]) {
-            NSData *fileData = [NSData dataWithContentsOfURL:filePath];
+        if (![[NSFileManager defaultManager] fileExistsAtPath:filePath.path]) {
+            NSLog(@"[EeveeSpotify] Not activating due to nonexistent file: %@", filePath.path);
 
-            NSUInteger usernameLength = (NSUInteger)(((const char *)[fileData bytes])[8]);
-            NSData *usernameData = [fileData subdataWithRange:NSMakeRange(9, usernameLength)];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[EVEBundleHelper sharedHelper] showPopupWithTitle:@"EeveeSpotify"
+                    message:@"An offline.bnk file was not found. Please log in and restart the app when you're done!"
+                    buttonText:@"Okay!"];
+            });
 
-            NSMutableData *blankData = [[[EVEBundleHelper sharedHelper] premiumBlankData] mutableCopy];
+            return YES;
+        };
 
-            // range(whatever, 0) is for INSERTING data (Data.insert swift equivalent) (also needs length: i think?)
-            [blankData replaceBytesInRange:NSMakeRange(8, 0) withBytes:(const void *)&usernameLength length:1];
-            [blankData replaceBytesInRange:NSMakeRange(9, 0) withBytes:[usernameData bytes] length:[usernameData length]];
+        NSData *fileData = [NSData dataWithContentsOfURL:filePath];
+        NSUInteger usernameLength = (NSUInteger)(((const char *)[fileData bytes])[8]);
+        NSData *usernameData = [fileData subdataWithRange:NSMakeRange(9, usernameLength)];
+        NSMutableData *blankData = [[[EVEBundleHelper sharedHelper] premiumBlankData] mutableCopy];
 
-            [blankData writeToURL:filePath atomically:NO];
-            NSLog(@"[EeveeSpotify] Successfully applied");
-        } else {
-            NSLog(@"[EeveeSpotify] Not activating due to nonexistent file: %@", filePath.path);
-        }
+        // range(whatever, 0) is for INSERTING data (Data.insert swift equivalent) (also needs length: i think?)
+        [blankData replaceBytesInRange:NSMakeRange(8, 0) withBytes:(const void *)&usernameLength length:1];
+        [blankData replaceBytesInRange:NSMakeRange(9, 0) withBytes:[usernameData bytes] length:[usernameData length]];
+
+        [blankData writeToURL:filePath atomically:NO];
+        NSLog(@"[EeveeSpotify] Successfully applied");
+
+        // runs in background, reapplies every 20 seconds, maybe this could be useful?
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+            for (;;) {
+                // waits 20 seconds without blocking thread
+                dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+                dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20.0 * NSEC_PER_SEC));
+                dispatch_after(delay, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+                    dispatch_semaphore_signal(semaphore);
+                });
+                dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+                [blankData writeToURL:filePath atomically:NO];
+                NSLog(@"[EeveeSpotify] Successfully reapplied");
+            };
+        });
     } @catch (NSException *error) {
         NSLog(@"[EeveeSpotify] Unable to apply tweak: %@", error);
     }