Merge pull request #1025 from zom/zom_dev

Don't expire last key, group notification fix

Author: chrisballinger

ChatSecure/Classes/Categories/UIApplication+ChatSecure.swift

@@ -138,7 +138,7 @@ public extension UIApplication {
             let chatString = WANTS_TO_CHAT_STRING()
             let text = "\(name) \(chatString)"
             let unreadCount = self.applicationIconBadgeNumber + 1
-            self.showLocalNotificationWith(identifier: nil, body: text, badge: unreadCount, userInfo: [kOTRNotificationType:kOTRNotificationTypeSubscriptionRequest], recurring: false)
+            self.showLocalNotificationWith(groupingIdentifier: nil, body: text, badge: unreadCount, userInfo: [kOTRNotificationType:kOTRNotificationTypeSubscriptionRequest], recurring: false)
         }
     }
 
@@ -158,7 +158,7 @@ public extension UIApplication {
             let userInfo:[AnyHashable:Any] = [kOTRNotificationThreadKey:identifier,
                                               kOTRNotificationThreadCollection:thread.threadCollection,
                                               kOTRNotificationType: kOTRNotificationTypeApprovedBuddy]
-            self.showLocalNotificationWith(identifier: identifier, body: message, badge: unreadCount, userInfo: userInfo, recurring: false)
+            self.showLocalNotificationWith(groupingIdentifier: nil, body: message, badge: unreadCount, userInfo: userInfo, recurring: false)
         }
     }
 
@@ -173,13 +173,13 @@ public extension UIApplication {
                             kOTRNotificationThreadCollection:t.threadCollection,
                             kOTRNotificationType: kOTRNotificationTypeChatMessage]
             }
-            self.showLocalNotificationWith(identifier: identifier, body: text, badge: unreadCount, userInfo: userInfo, recurring: false)
+            self.showLocalNotificationWith(groupingIdentifier: nil, body: text, badge: unreadCount, userInfo: userInfo, recurring: false)
         }
     }
 
-    @objc public func showLocalNotificationWith(identifier:String?, body:String, badge:Int, userInfo:[AnyHashable:Any]?, recurring:Bool) {
+    @objc public func showLocalNotificationWith(groupingIdentifier:String?, body:String, badge:Int, userInfo:[AnyHashable:Any]?, recurring:Bool) {
         DispatchQueue.main.async {
-            if recurring, self.hasRecurringLocalNotificationWith(identifier: identifier) {
+            if recurring, self.hasRecurringLocalNotificationWith(identifier: groupingIdentifier) {
                 return // Already pending
             }
             // Use the new UserNotifications.framework on iOS 10+
@@ -188,8 +188,8 @@ public extension UIApplication {
                 localNotification.body = body
                 localNotification.badge = NSNumber(integerLiteral: badge)
                 localNotification.sound = UNNotificationSound.default()
-                if let identifier = identifier {
-                    localNotification.threadIdentifier = identifier
+                if let threadKey = userInfo?[kOTRNotificationThreadKey] as? String {
+                    localNotification.threadIdentifier = threadKey
                 }
                 if let userInfo = userInfo {
                     localNotification.userInfo = userInfo
@@ -201,7 +201,7 @@ public extension UIApplication {
                     date.minute = 0
                     trigger = UNCalendarNotificationTrigger(dateMatching: date, repeats: true)
                 }
-                let request = UNNotificationRequest(identifier: UUID().uuidString, content: localNotification, trigger: trigger) // Schedule the notification.
+                let request = UNNotificationRequest(identifier: groupingIdentifier ?? UUID().uuidString, content: localNotification, trigger: trigger) // Schedule the notification.
                 let center = UNUserNotificationCenter.current()
                 center.add(request, withCompletionHandler: { (error: Error?) in
                     if let error = error as NSError? {
@@ -325,19 +325,6 @@ public extension UIApplication {
         let userInfo = [kOTRNotificationType: kOTRNotificationTypeConnectionError,
                         kOTRNotificationAccountKey: accountKey]
 
-        if #available(iOS 10.0, *) {
-            UNUserNotificationCenter.current().getDeliveredNotifications(completionHandler: { (notifications) in
-                // FIXME: this deduplication code doesn't seem to work
-                // if we are already showing a notification, let's not spam the user too much with more of them
-                for notification in notifications {
-                    if notification.request.identifier == accountKey {
-                        return
-                    }
-                }
-                self.showLocalNotificationWith(identifier: accountKey, body: body, badge: badge, userInfo: userInfo, recurring: false)
-            })
-        } else {
-            showLocalNotificationWith(identifier: accountKey, body: body, badge: badge, userInfo: userInfo, recurring: false)
-        }
+        self.showLocalNotificationWith(groupingIdentifier: accountKey, body: body, badge: badge, userInfo: userInfo, recurring: false)
     }
 }

ChatSecure/Classes/Model/Yap Storage/OMEMO-Storage/OMEMODevice.m

@@ -44,8 +44,19 @@ - (BOOL) isTrusted {
     return (_trustLevel == OMEMOTrustLevelTrustedTofu || _trustLevel == OMEMOTrustLevelTrustedUser) && ![self isExpired];
 }
 
-/** if lastSeenDate is > 30 days */
+/** if lastSeenDate is > 30 days, but not if ALL keys are expired and this is the one last seen */
 - (BOOL) isExpired {
+    if ([self _isExpired]) {
+        if (self.lastSeenDate && [OMEMODevice isLastSeenExpiredDevice:self]) {
+            return NO;
+        }
+        return YES;
+    }
+    return NO;
+}
+
+/** if lastSeenDate is > 30 days */
+- (BOOL) _isExpired {
     if (!self.lastSeenDate) {
         return YES;
     }
@@ -57,6 +68,35 @@ - (BOOL) isExpired {
     return NO;
 }
 
+/** If ALL devices are considered expired, return TRUE if device is the one that was last seen of them all. Kind of hackish, but would have required major refactoring. */
++ (BOOL) isLastSeenExpiredDevice:(OMEMODevice *)device {
+    __block NSArray <OMEMODevice *>* devices = nil;
+    [[OTRDatabaseManager.shared connections].read readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
+        devices = [OMEMODevice allDevicesForParentKey:device.parentKey collection:device.parentCollection transaction:transaction];
+    }];
+    if (devices != nil && [devices count] > 0) {
+        NSArray *sortedDevices = [devices sortedArrayUsingComparator:^NSComparisonResult(OMEMODevice * _Nonnull obj1, OMEMODevice * _Nonnull obj2) {
+            NSDate *date1 = [NSDate distantPast];
+            NSDate *date2 = [NSDate distantPast];
+            if (obj1.lastSeenDate) {
+                date1 = obj1.lastSeenDate;
+            }
+            if (obj2.lastSeenDate) {
+                date2 = obj2.lastSeenDate;
+            }
+            // Latest first
+            return [date2 compare:date1];
+        }];
+        OMEMODevice *first = [sortedDevices firstObject];
+        
+        // They are ordered by date, so if "first" _isExpired they all are!
+        if (first.lastSeenDate && [first _isExpired] && [device.uniqueId isEqualToString:first.uniqueId]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 - (NSString*) humanReadableFingerprint {
     if (!self.publicIdentityKeyData) {
         return @"";

ChatSecure/Classes/Model/Yap Storage/OTRXMPPRoom.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import YapDatabase.YapDatabaseRelationship
-import OTRAssets
 
 @objc public enum RoomSecurity: Int {
     /// will choose omemo if _any_ occupants have available keys
@@ -35,7 +34,7 @@ import OTRAssets
     /// JID of the room itself
     @objc private var jid:String?
 
-    @objc open var preferredSecurity: RoomSecurity = OTRBranding.defaultGroupPlaintext ? .plaintext : .best
+    @objc open var preferredSecurity: RoomSecurity = .best
 
     /// XMPPJID of the room itself
     @objc public var roomJID: XMPPJID? {

ChatSecure/Classes/View Controllers/OTRConversationViewController.m

@@ -156,7 +156,7 @@ - (void) continueOnboarding:(BOOL)hasAccounts {
                 notificationBody = [NSString stringWithFormat:MIGRATION_NOTIFICATION_WITH_DATE_STRING(), days];
             }
 
-            [[UIApplication sharedApplication] showLocalNotificationWithIdentifier:@"Migration" body:notificationBody badge:1 userInfo:[[NSDictionary alloc] initWithObjectsAndKeys:kOTRNotificationTypeNone, kOTRNotificationType, @"Migration", kOTRNotificationThreadKey, nil] recurring:YES];
+            [[UIApplication sharedApplication] showLocalNotificationWithGroupingIdentifier:@"Migration" body:notificationBody badge:1 userInfo:[[NSDictionary alloc] initWithObjectsAndKeys:kOTRNotificationTypeNone, kOTRNotificationType, @"Migration", kOTRNotificationThreadKey, nil] recurring:YES];
         }
     } else {
         [[UIApplication sharedApplication] cancelRecurringLocalNotificationWithIdentifier:@"Migration"];

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem 'cocoapods', '~> 1.5.0'
+gem 'cocoapods', '~> 1.5.3'

Gemfile.lock

@@ -70,7 +70,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.5.0)
+  cocoapods (~> 1.5.3)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

OTRAssets/OTRBranding.h

@@ -98,8 +98,5 @@ FOUNDATION_EXPORT NSString *const kOTRSettingKeyLanguage;
 /** If enabled, will allow OMEMO functionality within the app. Defaults to YES if setting key is not present. */
 @property (class, readonly) BOOL allowOMEMO;
 
-/** If enabled, will enter groups in plaintext mode. Defaults to NO if setting key is not present, which will result in setting transport security to "best". */
-@property (class, readonly) BOOL defaultGroupPlaintext;
-
 @end
 NS_ASSUME_NONNULL_END

OTRAssets/OTRBranding.m

@@ -168,16 +168,6 @@ + (BOOL) allowOMEMO {
     }
 }
 
-+ (BOOL) defaultGroupPlaintext {
-    NSNumber *result = [[self defaultPlist] objectForKey:@"DefaultGroupPlaintext"];
-    if (!result) {
-        return NO;
-    } else {
-        return result.boolValue;
-    }
-}
-
-
 /** Returns true if we're running the official ChatSecure */
 + (BOOL) matchesUpstream {
     return [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.chrisballinger.ChatSecure"];

OTRResources/Branding.plist

@@ -48,7 +48,5 @@
 	<false/>
 	<key>AllowOMEMO</key>
 	<true/>
-	<key>DefaultGroupPlaintext</key>
-	<false/>
 </dict>
 </plist>