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

Fixed RecentCall unconditionally setting userNotified, even for missed calls //FREEBIE

This commit is contained in:
Craig Gidney 2014-09-20 19:03:49 -04:00 committed by Frederic Jacobs
parent b9cf163b1f
commit 06a4597859
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Signal.xcodeproj/project.pbxproj
View File

@ -429,6 +429,7 @@
B9EB5AC61884D370007CBB57 /* UnseenWhisperUserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B9EB5AC51884D370007CBB57 /* UnseenWhisperUserCell.m */; };
B9EB5AC71884D370007CBB57 /* UnseenWhisperUserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B9EB5AC51884D370007CBB57 /* UnseenWhisperUserCell.m */; };
B9EB5ACA1884D387007CBB57 /* UnseenWhisperUserCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B9EB5AC81884D387007CBB57 /* UnseenWhisperUserCell.xib */; };
BF8C3D8319CE3B6A008F644C /* RecentCallTest.m in Sources */ = {isa = PBXBuildFile; fileRef = BF8C3D8219CE3B6A008F644C /* RecentCallTest.m */; };
BFB074C119A4BCA400F2947C /* FutureUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB074BF19A4BCA400F2947C /* FutureUtilTest.m */; };
BFB074C219A4BCA400F2947C /* ObservableTest.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB074C019A4BCA400F2947C /* ObservableTest.m */; };
BFB074C719A5611000F2947C /* FutureUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB074C419A5611000F2947C /* FutureUtil.m */; };
@ -1134,6 +1135,7 @@
B9EB5AC41884D370007CBB57 /* UnseenWhisperUserCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnseenWhisperUserCell.h; sourceTree = "<group>"; };
B9EB5AC51884D370007CBB57 /* UnseenWhisperUserCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnseenWhisperUserCell.m; sourceTree = "<group>"; };
B9EB5AC81884D387007CBB57 /* UnseenWhisperUserCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UnseenWhisperUserCell.xib; sourceTree = "<group>"; };
BF8C3D8219CE3B6A008F644C /* RecentCallTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentCallTest.m; sourceTree = "<group>"; };
BFB074BF19A4BCA400F2947C /* FutureUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FutureUtilTest.m; sourceTree = "<group>"; };
BFB074C019A4BCA400F2947C /* ObservableTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObservableTest.m; sourceTree = "<group>"; };
BFB074C319A5611000F2947C /* FutureUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FutureUtil.h; sourceTree = "<group>"; };
@ -2190,16 +2192,17 @@
A15706EA17F0CD6D007C2BD6 /* test */ = {
isa = PBXGroup;
children = (
76919BF51805D169008C664A /* contact */,
A15706F217F0CD6D007C2BD6 /* audio */,
BF8C3D8119CE3B6A008F644C /* call */,
76919BF51805D169008C664A /* contact */,
A157070017F0CD6D007C2BD6 /* network */,
A157072E17F0CD6D007C2BD6 /* phone */,
A157073417F0CD6D007C2BD6 /* profiling */,
A157073917F0CD6D007C2BD6 /* Supporting Files */,
A157073D17F0CD6D007C2BD6 /* util */,
B684A46C19C3446200B11029 /* PushManagerTest.m */,
A157073B17F0CD6D007C2BD6 /* TestUtil.h */,
A157073C17F0CD6D007C2BD6 /* TestUtil.m */,
B684A46C19C3446200B11029 /* PushManagerTest.m */,
A157073D17F0CD6D007C2BD6 /* util */,
);
path = test;
sourceTree = "<group>";
@ -2774,6 +2777,14 @@
name = Translations;
sourceTree = "<group>";
};
BF8C3D8119CE3B6A008F644C /* call */ = {
isa = PBXGroup;
children = (
BF8C3D8219CE3B6A008F644C /* RecentCallTest.m */,
);
path = call;
sourceTree = "<group>";
};
D221A07E169C9E5E00537ABF = {
isa = PBXGroup;
children = (
@ -3720,6 +3731,7 @@
A157076D17F0CD6D007C2BD6 /* SecureEndPointTest.m in Sources */,
A157076E17F0CD6D007C2BD6 /* UdpSocketTest.m in Sources */,
76EB05C318170B33006006FC /* DhPacketSharedSecretHashes.m in Sources */,
BF8C3D8319CE3B6A008F644C /* RecentCallTest.m in Sources */,
76EB05C718170B33006006FC /* HelloAckPacket.m in Sources */,
76EB059918170B33006006FC /* HttpRequestOrResponse.m in Sources */,
A157076F17F0CD6D007C2BD6 /* PhoneNumberTest.m in Sources */,

2
Signal/src/call/RecentCall.m
View File

@ -26,7 +26,7 @@ NSString *const CALL_TYPE_IMAGE_NAME_OUTGOING = @"outgoing_call_icon";
recentCall->callType = type;
recentCall->date = [NSDate date];
recentCall->phoneNumber = number;
recentCall->userNotified = RPRecentCallTypeMissed ? false : true;
recentCall->userNotified = type == RPRecentCallTypeMissed ? false : true;
return recentCall;
}
-(void)updateRecentCallWithContactId:(ABRecordID)contactID{

32
Signal/test/call/RecentCallTest.m Normal file
View File

@ -0,0 +1,32 @@
#import <XCTest/XCTest.h>
#import "TestUtil.h"
#import "RecentCall.h"
@interface RecentCallTest : XCTestCase
@end
@implementation RecentCallTest
-(void) testConstruction_Incoming {
RecentCall* r = [RecentCall recentCallWithContactID:123
andNumber:testPhoneNumber1
andCallType:RPRecentCallTypeIncoming];
test(r.contactRecordID == 123);
test([r.phoneNumber.toE164 isEqual:testPhoneNumber1.toE164]);
test(abs([r.date timeIntervalSinceDate:NSDate.date] < 10));
test(r.userNotified == true);
test(r.callType == RPRecentCallTypeIncoming);
}
-(void) testConstruction_Missed {
RecentCall* r = [RecentCall recentCallWithContactID:235
andNumber:testPhoneNumber2
andCallType:RPRecentCallTypeMissed];
test(r.contactRecordID == 235);
test([r.phoneNumber.toE164 isEqual:testPhoneNumber2.toE164]);
test(abs([r.date timeIntervalSinceDate:NSDate.date] < 10));
test(r.userNotified == false);
test(r.callType == RPRecentCallTypeMissed);
}
@end