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

Merge branch 'database-refactor' into ui-media-message

Browse Source
pull/647/head
ryanzhao 3 years ago
parent cd9a8330db 3df3114bee
commit 88bc560c1b
8 changed files with 142 additions and 107 deletions
Show Stats Download Patch File Download Diff File

4
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -6830,7 +6830,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 356;
CURRENT_PROJECT_VERSION = 357;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -6902,7 +6902,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 356;
CURRENT_PROJECT_VERSION = 357;
DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",

15
Session/Media Viewing & Editing/MediaDetailViewController.swift
Unescape Escape View File

@ -54,14 +54,25 @@ class MediaDetailViewController: OWSViewController, UIScrollViewDelegate, OWSVid
galleryItem.attachment.thumbnail(
size: .large,
success: { [weak self] image, _ in
self?.image = image
// Only reload the content if the view has already loaded (if it
// hasn't then it'll load with the image immediately)
let updateUICallback = {
self?.image = image
if self?.isViewLoaded == true {
self?.updateContents()
self?.updateMinZoomScale()
}
}
guard Thread.isMainThread else {
DispatchQueue.main.async {
updateUICallback()
}
return
}
updateUICallback()
},
failure: {
SNLog("Could not load media.")

27
Session/Utilities/BackgroundPoller.swift
Unescape Escape View File

@ -7,13 +7,9 @@ import SessionSnodeKit
import SessionMessagingKit
import SessionUtilitiesKit
@objc(LKBackgroundPoller)
public final class BackgroundPoller: NSObject {
public final class BackgroundPoller {
private static var promises: [Promise<Void>] = []
private override init() { }
@objc(pollWithCompletionHandler:)
public static func poll(completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
promises = []
.appending(pollForMessages())
@ -40,12 +36,29 @@ public final class BackgroundPoller: NSObject {
}
)
// Background tasks will automatically be terminated after 30 seconds (which results in a crash
// and a prompt to appear for the user) we want to avoid this so we start a timer which expires
// after 25 seconds allowing us to cancel all pending promises
let cancelTimer: Timer = Timer.scheduledTimerOnMainThread(withTimeInterval: 25, repeats: false) { timer in
timer.invalidate()
guard promises.contains(where: { !$0.isResolved }) else { return }
SNLog("Background poll failed due to manual timeout")
completionHandler(.failed)
}
when(resolved: promises)
.done { _ in
cancelTimer.invalidate()
completionHandler(.newData)
}
.catch { error in
// If we have already invalidated the timer then do nothing (we essentially timed out)
guard cancelTimer.isValid else { return }
SNLog("Background poll failed due to error: \(error)")
cancelTimer.invalidate()
completionHandler(.failed)
}
}
@ -74,7 +87,7 @@ public final class BackgroundPoller: NSObject {
ClosedGroupPoller.poll(
groupPublicKey,
on: DispatchQueue.main,
maxRetryCount: 4,
maxRetryCount: 0,
isBackgroundPoll: true
)
}
@ -85,7 +98,6 @@ public final class BackgroundPoller: NSObject {
.then(on: DispatchQueue.main) { swarm -> Promise<Void> in
guard let snode = swarm.randomElement() else { throw SnodeAPIError.generic }
return attempt(maxRetryCount: 4, recoveringOn: DispatchQueue.main) {
return SnodeAPI.getMessages(from: snode, associatedWith: publicKey)
.then(on: DispatchQueue.main) { messages -> Promise<Void> in
guard !messages.isEmpty else { return Promise.value(()) }
@ -158,5 +170,4 @@ public final class BackgroundPoller: NSObject {
}
}
}
}
}

2
SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift
Unescape Escape View File

@ -2328,7 +2328,7 @@ class OpenGroupAPISpec: QuickSpec {
OpenGroupAPI
.downloadFile(
db,
fileId: 1,
fileId: "1",
from: "testRoom",
on: "testserver",
using: dependencies

34
SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
Unescape Escape View File

@ -1574,7 +1574,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 10,
imageId: "10",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -1732,7 +1732,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 10,
imageId: "10",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -1843,7 +1843,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 10,
imageId: "10",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -1912,7 +1912,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 10,
imageId: "10",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -2988,7 +2988,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 12,
imageId: "12",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -3104,7 +3104,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 12,
imageId: "12",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -3188,7 +3188,7 @@ class OpenGroupManagerSpec: QuickSpec {
created: 0,
activeUsers: 0,
activeUsersCutoff: 0,
imageId: 12,
imageId: "12",
pinnedMessages: nil,
admin: false,
globalAdmin: false,
@ -3279,7 +3279,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: "testServer",
using: dependencies
@ -3293,7 +3293,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: "testServer",
using: dependencies
@ -3321,7 +3321,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: "testServer",
using: dependencies
@ -3348,7 +3348,7 @@ class OpenGroupManagerSpec: QuickSpec {
return Promise<(OnionRequestResponseInfoType, Data?)>.pending().promise
}
static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, using version: OnionRequestAPIVersion, associatedWith publicKey: String?) -> Promise<Data> {
static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, associatedWith publicKey: String?) -> Promise<Data> {
return Promise.value(Data())
}
}
@ -3357,7 +3357,7 @@ class OpenGroupManagerSpec: QuickSpec {
let promise = mockStorage.read { db in
OpenGroupManager.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: "testServer",
using: dependencies
@ -3382,7 +3382,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: OpenGroupAPI.defaultServer,
using: dependencies
@ -3400,7 +3400,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: OpenGroupAPI.defaultServer,
using: dependencies
@ -3428,7 +3428,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: OpenGroupAPI.defaultServer,
using: dependencies
@ -3471,7 +3471,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: OpenGroupAPI.defaultServer,
using: dependencies
@ -3500,7 +3500,7 @@ class OpenGroupManagerSpec: QuickSpec {
OpenGroupManager
.roomImage(
db,
fileId: 1,
fileId: "1",
for: "testRoom",
on: OpenGroupAPI.defaultServer,
using: dependencies

2
SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift
Unescape Escape View File

@ -46,7 +46,7 @@ class SOGSEndpointSpec: QuickSpec {
// Files
expect(OpenGroupAPI.Endpoint.roomFile("test").path).to(equal("room/test/file"))
expect(OpenGroupAPI.Endpoint.roomFileIndividual("test", 123).path).to(equal("room/test/file/123"))
expect(OpenGroupAPI.Endpoint.roomFileIndividual("test", "123").path).to(equal("room/test/file/123"))
// Inbox/Outbox (Message Requests)

2
SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
Unescape Escape View File

@ -54,7 +54,7 @@ class TestOnionRequestAPI: OnionRequestAPIType {
return Promise.value((responseInfo, mockResponse))
}
static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, using version: OnionRequestAPIVersion, associatedWith publicKey: String?) -> Promise<Data> {
static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, associatedWith publicKey: String?) -> Promise<Data> {
return Promise.value(mockResponse!)
}
}

33
SessionSnodeKit/OnionRequestAPI.swift
Unescape Escape View File

@ -212,13 +212,13 @@ public enum OnionRequestAPI: OnionRequestAPIType {
}
// randomElement() uses the system's default random generator, which is cryptographically secure
if paths.count >= targetPathCount {
if let snode: Snode = snode {
return Promise { $0.fulfill(paths.filter { !$0.contains(snode) }.randomElement()!) }
}
else {
return Promise { $0.fulfill(paths.randomElement()!) }
}
if
paths.count >= targetPathCount,
let targetPath: [Snode] = paths
.filter({ snode == nil || !$0.contains(snode!) })
.randomElement()
{
return Promise { $0.fulfill(targetPath) }
}
else if !paths.isEmpty {
if let snode = snode {
@ -228,13 +228,22 @@ public enum OnionRequestAPI: OnionRequestAPIType {
}
else {
return buildPaths(reusing: paths).map2 { paths in
return paths.filter { !$0.contains(snode) }.randomElement()!
guard let path: [Snode] = paths.filter({ !$0.contains(snode) }).randomElement() else {
throw OnionRequestAPIError.insufficientSnodes
}
return path
}
}
}
else {
buildPaths(reusing: paths) // Re-build paths in the background
return Promise { $0.fulfill(paths.randomElement()!) }
guard let path: [Snode] = paths.randomElement() else {
return Promise(error: OnionRequestAPIError.insufficientSnodes)
}
return Promise { $0.fulfill(path) }
}
}
else {
@ -247,7 +256,11 @@ public enum OnionRequestAPI: OnionRequestAPIType {
throw OnionRequestAPIError.insufficientSnodes
}
return paths.randomElement()!
guard let path: [Snode] = paths.randomElement() else {
throw OnionRequestAPIError.insufficientSnodes
}
return path
}
}
}

Write Preview
Loading…
Cancel
Save