Merge remote-tracking branch 'origin/master'

BlueBubblesApp · Mar 23, 2023 · 7ec2227 · 7ec2227
2 parents 57027ad + 7a5418d
commit 7ec2227
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/MacOS-10/BlueBubblesHelper.xcodeproj/project.pbxproj b/MacOS-10/BlueBubblesHelper.xcodeproj/project.pbxproj
@@ -430,7 +430,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = S6D73TBQQU;
 				DSTROOT = /;
@@ -445,7 +445,7 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.0.13;
+				MARKETING_VERSION = 0.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bluebubbles.messaging;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -462,7 +462,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = S6D73TBQQU;
 				DSTROOT = /;
@@ -477,7 +477,7 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.0.13;
+				MARKETING_VERSION = 0.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bluebubbles.messaging;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/...BlueBubblesHelper.xcworkspace/xcuserdata/tanay.xcuserdatad/UserInterfaceState.xcuserstate b/...BlueBubblesHelper.xcworkspace/xcuserdata/tanay.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MacOS-10/BlueBubblesHelper/BlueBubblesHelper.m b/MacOS-10/BlueBubblesHelper/BlueBubblesHelper.m
@@ -587,7 +587,13 @@ +(IMFileTransfer *) prepareFileTransferForAttachment:(NSURL *) originalPath file
     // Creates the initial transfer object
     IMFileTransfer *newTransfer = [[IMFileTransferCenter sharedInstance] transferForGUID:transferInitGuid];
     // Get location of where attachments should be placed
-    NSString *persistentPath = [[IMDPersistentAttachmentController sharedInstance] _persistentPathForTransfer:newTransfer filename:filename highQuality:TRUE];
+    NSString *persistentPath;
+    if ([[NSProcessInfo processInfo] operatingSystemVersion].minorVersion == 12) {
+        // Use a different method on macOS Sierra (10.12)
+        persistentPath = [[IMDPersistentAttachmentController sharedInstance] _persistentPathForTransfer:newTransfer filename:filename highQuality:TRUE];
+    } else {
+        persistentPath = [[IMDPersistentAttachmentController sharedInstance] _persistentPathForTransfer:newTransfer];
+    }
     DLog(@"BLUEBUBBLESHELPER: Requested persistent path: %@", persistentPath);
 
     if (persistentPath) {

diff --git a/MacOS-10/BlueBubblesHelper/IMDPersistentAttachmentController.h b/MacOS-10/BlueBubblesHelper/IMDPersistentAttachmentController.h
@@ -12,6 +12,7 @@
 
 + (id)sharedInstance;
 - (BOOL)cleanseOrphanedFileTransfers;
+- (id)_persistentPathForTransfer:(id)arg1; // 10.12 only
 - (id)_persistentPathForTransfer:(id)arg1 filename:(id)arg2 highQuality:(BOOL)arg3;
 - (BOOL)_deleteAttachmentForTransfer:(id)arg1 highQuality:(BOOL)arg2;
 - (BOOL)deleteAttachmentsForTransfer:(id)arg1;