/ - Diff - ChatSecure:Android - Guardian Project Dev (ARCHIVED SITE)

         [self goOnline];
         // Fetch latest vCard from server so we can update nickname
         //[self.xmppvCardTempModule fetchvCardTempForJID:self.JID ignoreStorage:YES];
         // [self.messageStorage.archiving retrieveMessageArchiveWithFields:nil withResultSet:nil];
         //NSDate *lastInteraction = OTRProtocolManager.shared.lastInteractionDate;
         [self.databaseConnection asyncReadWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
             OTRXMPPAccount *account = [self.account refetchWithTransaction:transaction];
             [self.messageStorage.archiving fetchHistoryWithArchiveJID:nil userJID:nil since:account.lastHistoryFetchDate];
         }];
         //[self.messageStorage.archiving fetchHistoryWithArchiveJID:nil userJID:nil since:lastInteraction];
         //[self.messageStorage.archiving retrieveMessageArchiveWithFields:nil withResultSet:nil];
+    }
     - (void)xmppStream:(XMPPStream *)sender didNotAuthenticate:(NSXMLElement *)error

             self.capabilities = capabilities
             self.carbons = XMPPMessageCarbons(dispatchQueue: dispatchQueue)
             self.archiving = XMPPMessageArchiveManagement(dispatchQueue: dispatchQueue)
             self.archiving.resultAutomaticPagingPageSize = NSNotFound
             self.fileTransfer = fileTransfer
             super.init(dispatchQueue: dispatchQueue)
             self.carbons.addDelegate(self, delegateQueue: self.moduleQueue)
-...
+        }
         /// It is a violation of the XMPP spec to discard messages with duplicate stanza elementIds. We must use XEP-0359 stanza-id only.
         private func isDuplicate(xmppMessage: XMPPMessage, stanzaId: String, buddyUniqueId: String, transaction: YapDatabaseReadTransaction) -> Bool {
         private func isDuplicate(message: OTRBaseMessage, transaction: YapDatabaseReadTransaction) -> Bool {
             var result = false
             transaction.enumerateMessages(elementId: nil, originId: nil, stanzaId: stanzaId) { (message, stop) in
             let buddyUniqueId = message.buddyUniqueId
             let oid = message.originId
             let sid = message.stanzaId
             if oid == nil, sid == nil {
                 return false
+            }
             transaction.enumerateMessages(elementId: nil, originId: oid, stanzaId: sid) { (message, stop) in
                 if message.threadId == buddyUniqueId {
                     result = true
                     stop.pointee = true
-...
+                }
                 // Bail out if we receive duplicate messages identified by XEP-0359
                 if let stanzaId = message.stanzaId,
                 self.isDuplicate(xmppMessage: xmppMessage, stanzaId: stanzaId, buddyUniqueId: buddy.uniqueId, transaction: transaction) {
                 if self.isDuplicate(message: message, transaction: transaction) {
                     DDLogWarn("Duplicate forwarded message received: \(xmppMessage)")
                     return
+                }
-...
                                         body: String?,
                                         accountId: String,
                                         preSave: PreSave? = nil) {
             var incomingMessage: OTRIncomingMessage? = nil
             //var incomingMessage: OTRIncomingMessage? = nil
             connection.asyncReadWrite({ (transaction) in
                 guard let account = OTRXMPPAccount.fetchObject(withUniqueID: accountId, transaction: transaction),
                     let fromJID = message.from,
-...
                     return
+                }
                 incomingMessage = OTRIncomingMessage(xmppMessage: message, body: body, account: account, buddy: buddy, capabilities: self.capabilities)
                 let incoming = OTRIncomingMessage(xmppMessage: message, body: body, account: account, buddy: buddy, capabilities: self.capabilities)
                 // Check for duplicates
                 if let stanzaId = incomingMessage?.stanzaId,
                     self.isDuplicate(xmppMessage: message, stanzaId: stanzaId, buddyUniqueId: buddy.uniqueId, transaction: transaction) {
                 if self.isDuplicate(message: incoming, transaction: transaction) {
                     DDLogWarn("Duplicate message received: \(message)")
                     return
+                }
                 guard let incoming = incomingMessage, let text = incoming.text, text.count > 0 else {
                 guard let text = incoming.text, text.count > 0 else {
                     // discard empty message text
                     return
+                }
-...
+    }
     extension MessageStorage: XMPPMessageArchiveManagementDelegate {
         public func xmppMessageArchiveManagement(_ xmppMessageArchiveManagement: XMPPMessageArchiveManagement, didFinishReceivingMessagesWith resultSet: XMPPResultSet) {
             connection.asyncReadWrite { (transaction) in
                 guard let accountId = xmppMessageArchiveManagement.xmppStream?.accountId,
                     let account = OTRXMPPAccount.fetchObject(withUniqueID: accountId, transaction: transaction)?.copyAsSelf() else {
                         return
+                }
                 account.lastHistoryFetchDate = Date()
                 account.save(with: transaction)
+            }
+        }
         public func xmppMessageArchiveManagement(_ xmppMessageArchiveManagement: XMPPMessageArchiveManagement, didFailToReceiveMessages error: XMPPIQ) {
             DDLogError("Failed to receive messages \(error)")
+        }

     import Foundation
     import XMPPFramework
     extension XMPPMessageArchiveManagement {
         public func fetchHistory(archiveJID: XMPPJID? = nil, userJID: XMPPJID? = nil, since: Date? = nil) {
     public extension XMPPMessageArchiveManagement {
         @objc public func fetchHistory(archiveJID: XMPPJID? = nil, userJID: XMPPJID? = nil, since: Date? = nil) {
             var fields: [XMLElement] = []
             if let userJID = userJID {
-...
                 let start = XMPPMessageArchiveManagement.field(withVar: "start", type: nil, andValue: xmppDateString)
                 fields.append(start)
+            }
             retrieveMessageArchive(at: archiveJID, withFields: fields, with: nil)
             retrieveMessageArchive(at: archiveJID ?? xmppStream?.myJID?.bareJID, withFields: fields, with: nil)
+        }
+    }

     @property (nonatomic, strong, nullable) NSString *pushPubsubEndpoint;
     @property (nonatomic, strong, nullable) NSString *pushPubsubNode;
     /** For usage with MAM */
     @property (nonatomic, strong, nullable) NSDate *lastHistoryFetchDate;
     + (uint16_t)defaultPort;
     + (NSString *)newResource;

             [self scrollToBottomAnimated:animated];
         });
         self.loadingMessages = NO;
         [self fetchMessageHistory];
+    }
     - (void)viewWillAppear:(BOOL)animated
-...
     #pragma - mark Setters & getters
     - (void) fetchMessageHistory {
         [self.readOnlyDatabaseConnection asyncReadWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
             id<OTRThreadOwner> thread = [self threadObjectWithTransaction:transaction];
             OTRXMPPManager *xmpp = [self xmppManagerWithTransaction:transaction];
             [xmpp fetchHistoryForThread:thread transaction:transaction];
         }];
+    }
     - (OTRAttachmentPicker *)attachmentPicker
+    {
         if (!_attachmentPicker) {

     	<key>CFBundlePackageType</key>
     	<string>APPL</string>
     	<key>CFBundleShortVersionString</key>
     	<string>4.2.2</string>
     	<string>4.3.0</string>
     	<key>CFBundleSignature</key>
     	<string>????</string>
     	<key>CFBundleURLTypes</key>
-...
     		</dict>
     	</array>
     	<key>CFBundleVersion</key>
     	<string>111</string>
     	<string>113</string>
     	<key>FacebookAppID</key>
     	<string>447241325394334</string>
     	<key>FacebookDisplayName</key>

Submodules/XMPPFramework
1		Subproject commit f5f1cea4d4553fed05fe388a747c73398ca7568a
	1	Subproject commit b1a3bad5431020171d2c01fbd1b55dcb65876ce3

Core Apps » ChatSecure:Android

Revision 8358d691