1.4-git9 - fixes cracked updated apps bug

Author: ttwj

Classes/Application.m

@@ -52,6 +52,7 @@ - (id)initWithAppInfo:(NSDictionary *)info
         dictRep = copy;
         isCracking = NO;
         _info = info;
+        
     }
     return self;
 }

Classes/ApplicationLister.h

@@ -16,4 +16,5 @@
 - (NSArray *)crackedApps;
 - (void)saveModifiedAppsCache;
 - (NSArray *)modifiedApps;
+-(void)crackedApp:(Application*) app;
 @end

Classes/ApplicationLister.m

@@ -12,6 +12,7 @@
 #import "Preferences.h"
 
 #define applistCachePath @"/etc/applist-cache.clutch"
+#define crackedAppPath @"/etc/cracked.clutch"
 
 NSArray * get_application_list(BOOL sort) {
 
@@ -68,7 +69,7 @@
                                                                    @"ApplicationBasename":[appPath lastPathComponent],
                                                                    @"ApplicationVersion":version,
                                                                    @"ApplicationBundleID":bundleID,
-                                                                   @"ApplicationSINF":SINF,
+                                                                   //@"ApplicationSINF":SINF,
                                                                    @"ApplicationExecutableName":executableName,
                                                                    @"MinimumOSVersion":minimumOSVersion}];
 
@@ -129,24 +130,40 @@ + (instancetype)sharedInstance
 }
 
 - (NSArray *)modifiedApps {
-    NSArray* cache = [self modifiedAppCache];
+    NSDictionary* cracked = [self crackedAppsList];
     NSArray* apps = get_application_list(YES);
     NSMutableArray* modifiedApps = [[NSMutableArray alloc] init];
-    for (Application* oldApp in cache) {
-        for (Application* newApp in apps) {
-            if ([oldApp.applicationBundleID isEqualToString:newApp.applicationBundleID]) {
-                DEBUG(@"same bundle id deteced! %@", newApp.applicationBundleID);
-                if (newApp.appVersion != oldApp.appVersion) {
-                    [modifiedApps addObject:newApp];
-                    
-                }
-                
-            }
+    for (Application* app in apps) {
+        NSDictionary* appInfo = [cracked objectForKey:app.applicationBundleID];
+        if (appInfo == nil) {
+            continue;
+        }
+        Application* oldApp = [[Application alloc] initWithAppInfo:appInfo];
+        DEBUG(@"new app version: %ld, %ld", (long)oldApp.appVersion, (long)app.appVersion);
+        if (app.appVersion > oldApp.appVersion) {
+            [modifiedApps addObject:app];
         }
     }
+    DEBUG(@"modified apps array %@", modifiedApps);
     return modifiedApps;
 }
 
+-(void)crackedApp:(Application*) app {
+    DEBUG(@"cracked app ok");
+    DEBUG(@"this crack lol %ld", (long)app.appVersion);
+    NSMutableDictionary* dict = [[NSMutableDictionary alloc] initWithDictionary:[self crackedAppsList]];
+    if (dict == nil) {
+        dict = [[NSMutableDictionary alloc] init];
+    }
+    [dict setObject:app.dictionaryRepresentation forKey:app.applicationBundleID];
+    DEBUG(@"da dict %@", dict);
+    [dict writeToFile:crackedAppPath atomically:YES];
+}
+
+-(NSDictionary*)crackedAppsList {
+    return [[NSDictionary alloc] initWithContentsOfFile:crackedAppPath];
+}
+
 -(void)saveModifiedAppsCache {
     get_application_list(YES);
 }

Classes/Constants.h

@@ -26,8 +26,8 @@
 
 #define CLUTCH_TITLE "Clutch"
 #define CLUTCH_VERSION "1.4"
-#define CLUTCH_RELEASE "git-8"
-#define CLUTCH_BUILD 14008
+#define CLUTCH_RELEASE "git-9"
+#define CLUTCH_BUILD 14009
 #define CLUTCH_DEV 1
 
 void sha1(uint8_t *hash, uint8_t *data, size_t size);

Classes/Cracker.m

@@ -11,6 +11,7 @@
 #import "API.h"
 #import "YOPAPackage.h"
 #import "Localization.h"
+#import "ApplicationLister.h"
 
 #import <xpc/xpc.h>
 // ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/xpc /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/include/xpc
@@ -366,6 +367,10 @@ -(BOOL) execute
 
     DEBUG(@"------End Execute Crack------");
 
+    [[ApplicationLister sharedInstance] crackedApp:_app];
+    
+    DEBUG(@"Saved cracked app info!");
+    
     return crackOk;
 }
 

Classes/izip.m

@@ -158,15 +158,15 @@ - (void) zipCracked
     {
         // Only add it if it's not a directory. ZipArchive will take care of those.
         NSString *longPath = [_cracker->_tempPath stringByAppendingPathComponent:path];
-        NSLog(@"longpath %@ %@", longPath, path);
+        //NSLog(@"longpath %@ %@", longPath, path);
 
         if([fileManager fileExistsAtPath:longPath isDirectory:&isDir] && !isDir)
         {
-            DEBUG(@"adding file %@", longPath);
+            //DEBUG(@"adding file %@", longPath);
             [_archiver addFileToZip:longPath newname:path compressionLevel:compressionLevel];
         }
     }
-    DEBUG(@"subpaths %@", subpaths);
+    //DEBUG(@"subpaths %@", subpaths);
     return;
 }
 - (void) setCompressionLevel:(int) level

Classes/main.m

@@ -213,8 +213,6 @@ void cmd_list_applications(NSArray *applications)
 
 int cmd_crack_all(NSArray *applications)
 {
-    MSG(CLUTCH_CRACKING_ALL);
-    
     NSString *ipapath;
 
     for (Application* app in applications) {
@@ -262,6 +260,7 @@ int cmd_crack_app(Application *app, int yopa_enabled)
     {
         gettimeofday(&end, NULL);
 
+        
         crack = TRUE;
 
         printf("\t%s\n", [ipapath UTF8String]);
@@ -393,6 +392,7 @@ int main(int argc, char *argv[])
             {
                 applist = [[ApplicationLister sharedInstance] installedApps];
                 retVal = cmd_crack_all(applist);
+                MSG(CLUTCH_CRACKING_ALL);
             }
             else if ([arg isEqualToString:@"-f"] || [arg isEqualToString:@"-flush"])
             {
@@ -418,8 +418,14 @@ int main(int argc, char *argv[])
             {
                 //get updated apps only
                 applist = [[ApplicationLister sharedInstance] modifiedApps];
-                printf("\n cracking all updated apps!\n");
+                if ([applist count] == 0) {
+                    printf("You have no updated apps!\n");
+                    retVal = 0;
+                    goto endMain;
+                }
+                printf("Cracking all updated apps!\n");
                 retVal = cmd_crack_all(applist);
+                goto endMain;
             }
             else if ([arg isEqualToString:@"-h"] || [arg isEqualToString:@"-help"])
             {

Clutch.xcodeproj/project.xcworkspace/xcuserdata/ttwj.xcuserdatad/UserInterfaceState.xcuserstate

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3</string>
+	<string>1.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>9</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>