mirror of https://github.com/oxen-io/session-ios
Merge SignalMessaging into SignalUtilitiesKit
parent
ae635dbd36
commit
ffa64e4747
@ -1 +1 @@
|
||||
Subproject commit 323754e2fbc3d87c87538814d3695755818164ac
|
||||
Subproject commit 0e8cae4ccaa2bb1fe672b771696b988fd1007fbe
|
File diff suppressed because it is too large
Load Diff
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>$(MARKETING_VERSION)</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
@ -1,29 +0,0 @@
|
||||
|
||||
@objc
|
||||
public class LK002RemoveFriendRequests : OWSDatabaseMigration {
|
||||
|
||||
@objc
|
||||
class func migrationId() -> String {
|
||||
return "002"
|
||||
}
|
||||
|
||||
override public func runUp(completion: @escaping OWSDatabaseMigrationCompletion) {
|
||||
self.doMigrationAsync(completion: completion)
|
||||
}
|
||||
|
||||
private func doMigrationAsync(completion: @escaping OWSDatabaseMigrationCompletion) {
|
||||
DispatchQueue.global().async {
|
||||
Storage.writeSync { transaction in
|
||||
var interactionIDsToRemove: [String] = []
|
||||
transaction.enumerateRows(inCollection: TSInteraction.collection()) { key, object, _, _ in
|
||||
if !(object is TSInteraction) {
|
||||
interactionIDsToRemove.append(key)
|
||||
}
|
||||
}
|
||||
interactionIDsToRemove.forEach { transaction.removeObject(forKey: $0, inCollection: TSInteraction.collection()) }
|
||||
self.save(with: transaction)
|
||||
}
|
||||
completion()
|
||||
}
|
||||
}
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Availability.h>
|
||||
|
||||
#ifdef __OBJC__
|
||||
#import <UIKit/UIKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@import CocoaLumberjack;
|
||||
#ifdef DEBUG
|
||||
static const NSUInteger ddLogLevel = DDLogLevelAll;
|
||||
#else
|
||||
static const NSUInteger ddLogLevel = DDLogLevelInfo;
|
||||
#endif
|
||||
|
||||
#import <SessionProtocolKit/SessionProtocolKit.h>
|
||||
#import <SignalUtilitiesKit/SignalUtilitiesKit.h>
|
||||
#endif
|
@ -1,60 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
//! Project version number for SignalMessaging.
|
||||
FOUNDATION_EXPORT double SignalMessagingVersionNumber;
|
||||
|
||||
//! Project version string for SignalMessaging.
|
||||
FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
|
||||
|
||||
// The public headers of the framework
|
||||
#import <SignalMessaging/AppSetup.h>
|
||||
#import <SignalMessaging/AttachmentSharing.h>
|
||||
#import <SignalMessaging/BlockListUIUtils.h>
|
||||
#import <SignalMessaging/ContactCellView.h>
|
||||
#import <SignalMessaging/ContactTableViewCell.h>
|
||||
#import <SignalMessaging/ContactsViewHelper.h>
|
||||
#import <SignalMessaging/DebugLogger.h>
|
||||
#import <SignalMessaging/Environment.h>
|
||||
#import <SignalMessaging/NSAttributedString+OWS.h>
|
||||
#import <SignalMessaging/NewNonContactConversationViewController.h>
|
||||
#import <SignalMessaging/OWSAnyTouchGestureRecognizer.h>
|
||||
#import <SignalMessaging/OWSAudioPlayer.h>
|
||||
#import <SignalMessaging/OWSContactAvatarBuilder.h>
|
||||
#import <SignalMessaging/OWSContactOffersInteraction.h>
|
||||
#import <SignalMessaging/OWSContactsManager.h>
|
||||
#import <SignalMessaging/OWSConversationColor.h>
|
||||
#import <SignalMessaging/OWSDatabaseMigration.h>
|
||||
#import <SignalMessaging/OWSFormat.h>
|
||||
#import <SignalMessaging/OWSGroupAvatarBuilder.h>
|
||||
#import <SignalMessaging/OWSNavigationController.h>
|
||||
#import <SignalMessaging/OWSPreferences.h>
|
||||
#import <SignalMessaging/OWSProfileManager.h>
|
||||
#import <SignalMessaging/OWSQuotedReplyModel.h>
|
||||
#import <SignalMessaging/OWSSearchBar.h>
|
||||
#import <SignalMessaging/OWSSounds.h>
|
||||
#import <SignalMessaging/OWSSyncManager.h>
|
||||
#import <SignalMessaging/OWSTableViewController.h>
|
||||
#import <SignalMessaging/OWSTextField.h>
|
||||
#import <SignalMessaging/OWSTextView.h>
|
||||
#import <SignalMessaging/OWSUnreadIndicator.h>
|
||||
#import <SignalMessaging/OWSUserProfile.h>
|
||||
#import <SignalMessaging/OWSWindowManager.h>
|
||||
#import <SignalMessaging/ScreenLockViewController.h>
|
||||
#import <SignalMessaging/SelectRecipientViewController.h>
|
||||
#import <SignalMessaging/SharingThreadPickerViewController.h>
|
||||
#import <SignalMessaging/SignalKeyingStorage.h>
|
||||
#import <SignalMessaging/Theme.h>
|
||||
#import <SignalMessaging/ThreadUtil.h>
|
||||
#import <SignalMessaging/ThreadViewHelper.h>
|
||||
#import <SignalMessaging/UIColor+OWS.h>
|
||||
#import <SignalMessaging/UIFont+OWS.h>
|
||||
#import <SignalMessaging/UIUtil.h>
|
||||
#import <SignalMessaging/UIView+OWS.h>
|
||||
#import <SignalMessaging/UIViewController+OWS.h>
|
||||
#import <SignalMessaging/VersionMigrations.h>
|
||||
#import <SignalMessaging/ViewControllerUtils.h>
|
||||
#import <SignalUtilitiesKit/UIImage+OWS.h>
|
@ -1,11 +1,10 @@
|
||||
//
|
||||
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "Environment.h"
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SSKAsserts.h"
|
||||
#import "OWSContactsManager.h"
|
||||
#import "OWSWindowManager.h"
|
||||
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
|
||||
#import "OWSPreferences.h"
|
||||
#import <SignalUtilitiesKit/AppContext.h>
|
||||
#import <SignalUtilitiesKit/SSKEnvironment.h>
|
||||
#import "OWSSounds.h"
|
||||
|
||||
static Environment *sharedEnvironment = nil;
|
||||
|
@ -0,0 +1,17 @@
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Availability.h>
|
||||
|
||||
#ifdef __OBJC__
|
||||
#import <UIKit/UIKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@import PureLayout;
|
||||
|
||||
@import SessionMessagingKit;
|
||||
@import SessionProtocolKit;
|
||||
@import SessionSnodeKit;
|
||||
@import SessionUtilitiesKit;
|
||||
#endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue