mirror of https://github.com/oxen-io/session-ios
Upload test file to CloudKit.
Matthew Chen
7 years ago
parent
d06ad25d77
commit
593f7da72d
@ -0,0 +1,13 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "DebugUIPage.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface DebugUIBackup : DebugUIPage
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,76 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "DebugUIBackup.h"
|
||||
#import "OWSBackup.h"
|
||||
|
||||
//#import "OWSCountryMetadata.h"
|
||||
#import "OWSTableViewController.h"
|
||||
|
||||
//#import "RegistrationViewController.h"
|
||||
#import "Signal-Swift.h"
|
||||
|
||||
//#import "ThreadUtil.h"
|
||||
//#import <AxolotlKit/PreKeyBundle.h>
|
||||
//#import <SignalMessaging/AttachmentSharing.h>
|
||||
//#import <SignalMessaging/Environment.h>
|
||||
//#import <SignalMessaging/UIImage+OWS.h>
|
||||
//#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
|
||||
//#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
|
||||
//#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h>
|
||||
//#import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
|
||||
//#import <SignalServiceKit/SecurityUtils.h>
|
||||
//#import <SignalServiceKit/TSCall.h>
|
||||
//#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
|
||||
//#import <SignalServiceKit/TSThread.h>
|
||||
//#import <CloudKit/CloudKit.h>
|
||||
#import <Curve25519Kit/Randomness.h>
|
||||
|
||||
@import CloudKit;
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation DebugUIBackup
|
||||
|
||||
#pragma mark - Factory Methods
|
||||
|
||||
- (NSString *)name
|
||||
{
|
||||
return @"Backup";
|
||||
}
|
||||
|
||||
- (nullable OWSTableSection *)sectionForThread:(nullable TSThread *)thread
|
||||
{
|
||||
NSMutableArray<OWSTableItem *> *items = [NSMutableArray new];
|
||||
[items addObject:[OWSTableItem itemWithTitle:@"Backup test file @ CloudKit"
|
||||
actionBlock:^{
|
||||
[DebugUIBackup backupTestFile];
|
||||
}]];
|
||||
|
||||
return [OWSTableSection sectionWithTitle:self.name items:items];
|
||||
}
|
||||
|
||||
+ (void)backupTestFile
|
||||
{
|
||||
DDLogInfo(@"%@ backupTestFile.", self.logTag);
|
||||
|
||||
NSData *_Nullable data = [Randomness generateRandomBytes:32];
|
||||
OWSAssert(data);
|
||||
NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"pdf"];
|
||||
BOOL success = [data writeToFile:filePath atomically:YES];
|
||||
OWSAssert(success);
|
||||
|
||||
[OWSBackupAPI checkCloudKitAccessWithCompletion:^(BOOL hasAccess) {
|
||||
if (hasAccess) {
|
||||
[OWSBackupAPI saveTestFileToCloudWithFileUrl:[NSURL fileURLWithPath:filePath]
|
||||
completion:^(NSError *_Nullable error){
|
||||
// Do nothing, the API method will log for us.
|
||||
}];
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,98 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SignalServiceKit
|
||||
import CloudKit
|
||||
|
||||
//func FormatAnalyticsLocation(file: String, function: String) -> NSString {
|
||||
// return "\((file as NSString).lastPathComponent):\(function)" as NSString
|
||||
//}
|
||||
//
|
||||
//func OWSProdError(_ eventName: String, file: String, function: String, line: Int32) {
|
||||
// let location = FormatAnalyticsLocation(file: file, function: function)
|
||||
// OWSAnalytics
|
||||
// .logEvent(eventName, severity: .error, parameters: nil, location: location.utf8String!, line:line)
|
||||
//}
|
||||
//
|
||||
//func OWSProdInfo(_ eventName: String, file: String, function: String, line: Int32) {
|
||||
// let location = FormatAnalyticsLocation(file: file, function: function)
|
||||
// OWSAnalytics
|
||||
// .logEvent(eventName, severity: .info, parameters: nil, location: location.utf8String!, line:line)
|
||||
//}
|
||||
|
||||
@objc public class OWSBackupAPI: NSObject {
|
||||
@objc
|
||||
public class func recordIdForTest() -> String {
|
||||
return "test-\(NSUUID().uuidString)"
|
||||
}
|
||||
|
||||
@objc
|
||||
public class func recordIdForAttachmentStream(value: TSAttachmentStream) -> String {
|
||||
return "attachment-stream-\(value.uniqueId)"
|
||||
}
|
||||
|
||||
@objc
|
||||
public class func saveTestFileToCloud(fileUrl: NSURL,
|
||||
completion: @escaping (Error?) -> Swift.Void) {
|
||||
saveFileToCloud(fileUrl: fileUrl,
|
||||
recordId: recordIdForTest(),
|
||||
recordType: "test",
|
||||
completion: completion)
|
||||
}
|
||||
|
||||
@objc
|
||||
public class func saveFileToCloud(fileUrl: NSURL,
|
||||
recordId: String,
|
||||
recordType: String,
|
||||
completion: @escaping (Error?) -> Swift.Void) {
|
||||
let recordID = CKRecordID(recordName: recordId)
|
||||
let record = CKRecord(recordType: recordType, recordID: recordID)
|
||||
// artworkRecord["title"] = "MacKerricher State Park" as NSString
|
||||
// artworkRecord["artist"] = "Mei Chen" as NSString
|
||||
// artworkRecord["address"] = "Fort Bragg, CA" as NSString
|
||||
// artworkRecord[@"title" ] = @"MacKerricher State Park";
|
||||
// artworkRecord[@"artist"] = @"Mei Chen";
|
||||
// artworkRecord[@"address"] = @"Fort Bragg, CA";
|
||||
|
||||
let myContainer = CKContainer.default()
|
||||
let privateDatabase = myContainer.privateCloudDatabase
|
||||
privateDatabase.save(record) {
|
||||
(record, error) in
|
||||
|
||||
if let error = error {
|
||||
Logger.error("\(self.logTag) error saving record: \(error)")
|
||||
completion(error)
|
||||
} else {
|
||||
Logger.info("\(self.logTag) saved record.")
|
||||
completion(nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@objc
|
||||
public class func checkCloudKitAccess(completion: @escaping (Bool) -> Swift.Void) {
|
||||
CKContainer.default().accountStatus(completionHandler: { (accountStatus, error) in
|
||||
DispatchQueue.main.async {
|
||||
switch accountStatus {
|
||||
case .couldNotDetermine:
|
||||
Logger.error("\(self.logTag) could not determine CloudKit account status:\(error).")
|
||||
OWSAlerts.showErrorAlert(withMessage: NSLocalizedString("CLOUDKIT_STATUS_COULD_NOT_DETERMINE", comment: "Error indicating that the app could not determine that user's CloudKit account status"))
|
||||
completion(false)
|
||||
case .noAccount:
|
||||
Logger.error("\(self.logTag) no CloudKit account.")
|
||||
OWSAlerts.showErrorAlert(withMessage: NSLocalizedString("CLOUDKIT_STATUS_NO_ACCOUNT", comment: "Error indicating that user does not have an iCloud account."))
|
||||
completion(false)
|
||||
case .restricted:
|
||||
Logger.error("\(self.logTag) restricted CloudKit account.")
|
||||
OWSAlerts.showErrorAlert(withMessage: NSLocalizedString("CLOUDKIT_STATUS_RESTRICTED", comment: "Error indicating that the app was prevented from accessing the user's CloudKit account."))
|
||||
completion(false)
|
||||
case .available:
|
||||
Logger.error("\(self.logTag) no CloudKit account.")
|
||||
completion(true)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
// extern NSString *const OWSBackup_FileExtension;
|
||||
|
||||
// extern NSString *const NSNotificationNameBackupStateDidChange;
|
||||
|
||||
@protocol OWSBackupExportDelegate <NSObject>
|
||||
|
||||
- (void)backupExportDidSucceed;
|
||||
|
||||
- (void)backupExportDidFailWithError:(NSError *)error;
|
||||
|
||||
@end
|
||||
|
||||
//#pragma mark -
|
||||
|
||||
// typedef NS_ENUM(NSUInteger, OWSBackupState) {
|
||||
// OWSBackupState_AtRest = 0,
|
||||
// OWSBackupState_InProgress,
|
||||
// // OWSBackupState_Cancelled,
|
||||
// OWSBackupState_Failed,
|
||||
//};
|
||||
|
||||
@class OWSPrimaryStorage;
|
||||
|
||||
@interface OWSBackupExport : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithDelegate:(id<OWSBackupExportDelegate>)delegate
|
||||
primaryStorage:(OWSPrimaryStorage *)primaryStorage;
|
||||
|
||||
- (void)start;
|
||||
|
||||
- (void)cancel;
|
||||
|
||||
//@property (nonatomic, readonly) OWSBackupState backupExportState;
|
||||
//
|
||||
////@property (nonatomic, readonly) CGFloat backupProgress;
|
||||
////
|
||||
////// If non-nil, backup is encrypted.
|
||||
////@property (nonatomic, nullable, readonly) NSString *backupPassword;
|
||||
////
|
||||
////// Only applies to "backup export" task.
|
||||
////@property (nonatomic, nullable, readonly) TSThread *currentThread;
|
||||
////
|
||||
////@property (nonatomic, readonly) NSString *backupZipPath;
|
||||
////
|
||||
//
|
||||
//
|
||||
//+ (instancetype)sharedManager;
|
||||
//
|
||||
//- (BOOL)isBackupEnabled;
|
||||
//- (void)setIsBackupEnabled:(BOOL)value;
|
||||
|
||||
//- (void)exportBackup:(nullable TSThread *)currentThread skipPassword:(BOOL)skipPassword;
|
||||
//
|
||||
//- (void)importBackup:(NSString *)backupZipPath password:(NSString *_Nullable)password;
|
||||
//
|
||||
//- (void)cancel;
|
||||
//
|
||||
//+ (void)applicationDidFinishLaunching;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue