oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into voice-calls

This commit is contained in:
Niels Andriesse 2021-07-30 10:21:43 +10:00
parent 53a8c9fd57 ec4ce64887
commit f0c89b976f
11 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Session.xcodeproj/project.pbxproj
View File

@ -5191,7 +5191,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -5260,7 +5260,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = SUQ8J2PCT7;
ENABLE_NS_ASSERTIONS = NO;
@ -5321,7 +5321,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -5391,7 +5391,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = SUQ8J2PCT7;
ENABLE_NS_ASSERTIONS = NO;
@ -6276,7 +6276,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6345,7 +6345,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 279;
CURRENT_PROJECT_VERSION = 281;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",

15
Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/Contents.json vendored
View File

@ -1,19 +1,8 @@
{
"images" : [
{
"filename" : "ic_notification_mentions.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_notification_mentions-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_notification_mentions-2.png",
"idiom" : "universal",
"scale" : "3x"
"filename" : "ic_notifications_mentions.pdf",
"idiom" : "universal"
}
],
"info" : {

BIN
Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-1.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions-2.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notification_mentions.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Session/Meta/Images.xcassets/Session/NotifyMentions.imageset/ic_notifications_mentions.pdf vendored Normal file
View File

Binary file not shown.

3
Session/Notifications/AppNotifications.swift
View File

@ -353,8 +353,7 @@ public class NotificationPresenter: NSObject, NotificationsProtocol {
// Don't fire the notification if the current user isn't mentioned
// and isOnlyNotifyingForMentions is on.
let isUserMentioned = MentionUtilities.isUserMentioned(in: messageText ?? "")
if let groupThread = thread as? TSGroupThread, groupThread.isOnlyNotifyingForMentions && !isUserMentioned {
if let groupThread = thread as? TSGroupThread, groupThread.isOnlyNotifyingForMentions && !incomingMessage.isUserMentioned {
return
}

2
SessionMessagingKit/Messages/Signal/TSIncomingMessage.h
View File

@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) BOOL wasReceivedByUD;
@property (nonatomic, readonly) BOOL isUserMentioned;
- (instancetype)initMessageWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
messageBody:(nullable NSString *)body

7
SessionMessagingKit/Messages/Signal/TSIncomingMessage.m
View File

@ -13,6 +13,7 @@
#import "TSGroupThread.h"
#import <YapDatabase/YapDatabaseConnection.h>
#import <SessionUtilitiesKit/SessionUtilitiesKit.h>
#import <SessionMessagingKit/SessionMessagingKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -121,6 +122,12 @@ NS_ASSUME_NONNULL_BEGIN
return self.isExpiringMessage;
}
- (BOOL)isUserMentioned
{
NSString *userPublicKey = [SNGeneralUtilities getUserPublicKey];
return (self.body != nil && [self.body containsString:[NSString stringWithFormat:@"@%@", userPublicKey]]) || (self.quotedMessage != nil && [self.quotedMessage.authorId isEqualToString:userPublicKey]);
}
#pragma mark - OWSReadTracking
- (BOOL)shouldAffectUnreadCounts

4
SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
View File

@ -7,8 +7,8 @@ public final class ClosedGroupPoller : NSObject {
private var timers: [String:Timer] = [:]
// MARK: Settings
private static let minPollInterval: Double = 4
private static let maxPollInterval: Double = 2 * 60
private static let minPollInterval: Double = 2
private static let maxPollInterval: Double = 30
// MARK: Error
private enum Error : LocalizedError {

6
SignalUtilitiesKit/Messaging/OWSMessageUtils.m
View File

@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN
YapDatabaseViewTransaction *unreadMessages = [transaction ext:TSUnreadDatabaseViewExtensionName];
NSArray<NSString *> *allGroups = [unreadMessages allGroups];
for (NSString *groupID in allGroups) {
TSThread *thread = [TSThread fetchObjectWithUniqueID:groupID transaction:transaction];
TSGroupThread *thread = [TSGroupThread fetchObjectWithUniqueID:groupID transaction:transaction];
if (thread.isMuted) continue;
[unreadMessages enumerateKeysAndObjectsInGroup:groupID
usingBlock:^(NSString *collection, NSString *key, id object, NSUInteger index, BOOL *stop) {
@ -85,6 +85,10 @@ NS_ASSUME_NONNULL_BEGIN
NSLog(@"Found an already read message in the * unread * messages list.");
return;
}
TSIncomingMessage * incomingMessage = (TSIncomingMessage *)object;
if (incomingMessage != nil && thread.isOnlyNotifyingForMentions && !incomingMessage.isUserMentioned) {
return;
}
count += 1;
}];
}