pull/689/head
ryanzhao 2 years ago
parent 747695c39b
commit 5dc8f4e6e2

@ -167,17 +167,12 @@ final class JoinOpenGroupVC: BaseVC, UIPageViewControllerDataSource, UIPageViewC
try MessageSender.syncConfiguration(db, forceSyncNow: true).retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...) try MessageSender.syncConfiguration(db, forceSyncNow: true).retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
} }
let maybeThread: SessionThread? = Storage.shared.write { db in
let threadId: String = OpenGroup.idFor(roomToken: roomToken, server: server)
return try SessionThread.fetchOrCreate(db, id: threadId, variant: .openGroup)
}
self?.presentingViewController?.dismiss(animated: true, completion: nil) self?.presentingViewController?.dismiss(animated: true, completion: nil)
if let thread = maybeThread, shouldOpenCommunity { if shouldOpenCommunity {
SessionApp.presentConversation( SessionApp.presentConversation(
for: thread.id, for: OpenGroup.idFor(roomToken: roomToken, server: server),
threadVariant: thread.variant, threadVariant: .openGroup,
isMessageRequest: false, isMessageRequest: false,
action: .compose, action: .compose,
focusInteractionId: nil, focusInteractionId: nil,

@ -110,15 +110,12 @@ NS_ASSUME_NONNULL_BEGIN
self.capture.camera = self.capture.back; self.capture.camera = self.capture.back;
self.capture.focusMode = AVCaptureFocusModeContinuousAutoFocus; self.capture.focusMode = AVCaptureFocusModeContinuousAutoFocus;
self.capture.delegate = self; self.capture.delegate = self;
[self.capture start];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
self.capture.layer.frame = self.view.bounds; self.capture.layer.frame = self.view.bounds;
[self.view.layer addSublayer:self.capture.layer]; [self.view.layer addSublayer:self.capture.layer];
[self.view bringSubviewToFront:self.maskingView]; [self.view bringSubviewToFront:self.maskingView];
dispatch_async(self.captureQueue, ^{
[self.capture start];
});
}); });
}); });
} else { } else {

Loading…
Cancel
Save