fix

shaojiankui · Feb 24, 2022 · 4e4497a · 4e4497a
1 parent 072d972
commit 4e4497a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/SmartPush.xcodeproj/project.pbxproj b/SmartPush.xcodeproj/project.pbxproj
@@ -341,7 +341,7 @@
 				INFOPLIST_FILE = SmartPush/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.0;
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.skyfox.SmartPush;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -355,7 +355,7 @@
 				INFOPLIST_FILE = SmartPush/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.0;
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.skyfox.SmartPush;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/SmartPush/Manager/SecManager.m b/SmartPush/Manager/SecManager.m
@@ -23,7 +23,6 @@ @implementation SecManager
 //           CFBridgingRetain
             Sec *secModel = [self secModelWithRef:(__bridge_retained void *)(obj)];
             if ([self isPushCertificateWithName:secModel.name]) {
-                secModel.topicName =  [self topicNameWithCertificate:(__bridge_retained void *)(obj)];
                 [pushs addObject:secModel];
             }
         }
@@ -41,6 +40,7 @@ + (Sec*)secModelWithRef:(SecCertificateRef)sec{
     secModel.key = secModel.name;
     secModel.date  = [SecManager expirationWithCertificate:sec];
     secModel.expire = [NSString stringWithFormat:@"  [%@]", secModel.date ? [formatter stringFromDate: secModel.date] : @"expired"];
+    secModel.topicName =  [self topicNameWithCertificate:sec];
 
     return secModel;
 }
@@ -53,7 +53,8 @@ + (BOOL)isPushCertificateWithName:(NSString*)name{
         [name rangeOfString:@"Apple Push Services:"].location != NSNotFound||
         [name rangeOfString:@"Website Push ID:"].location != NSNotFound||
         [name rangeOfString:@"VoIP Services:"].location != NSNotFound||
-        [name rangeOfString:@"WatchKit Services:"].location != NSNotFound ) {
+        [name rangeOfString:@"WatchKit Services:"].location != NSNotFound||
+        [name rangeOfString:@"Apple Sandbox Push Services:"].location != NSNotFound ) {
         return YES;
     }
     return NO;
@@ -68,7 +69,8 @@ + (BOOL)isPushCertificate:(SecCertificateRef)sec{
         [name rangeOfString:@"Apple Push Services:"].location != NSNotFound||
         [name rangeOfString:@"Website Push ID:"].location != NSNotFound||
         [name rangeOfString:@"VoIP Services:"].location != NSNotFound||
-        [name rangeOfString:@"WatchKit Services:"].location != NSNotFound ) {
+        [name rangeOfString:@"WatchKit Services:"].location != NSNotFound ||
+        [name rangeOfString:@"Apple Sandbox Push Services:"].location != NSNotFound) {
         return YES;
     }
     return NO;