Commit 969f4b67 authored by Thomas Markiewicz's avatar Thomas Markiewicz

Merge branch 'release/1.0.1'

parents 57398f43 01e97678
Pipeline #35164 passed with stage
in 14 minutes and 51 seconds
CHANGES
=======
Development
Version 1.0.1
-----------------------------------------------------
* Added forgot password link to the login screen
* Updated app name in translation files
* Removed key backup option from Settings since it's not supported in LibremOne
* Updated terms and policy link to https://librem.one/policy
* Merged upstream Riot v0.9.1
Version 1.0.0
-----------------------------------------------------
* Removed prompt to backup keys until we can backup to our own server
* Fixed app name displayed when sharing images via Photos app
......
......@@ -2,7 +2,7 @@ source "https://rubygems.org"
gem "xcode-install"
gem "fastlane"
gem "cocoapods", '1.6.1'
gem "cocoapods", '~>1.7.2'
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
......@@ -12,11 +12,11 @@ GEM
atomos (0.1.3)
babosa (1.0.2)
claide (1.0.2)
cocoapods (1.6.1)
cocoapods (1.7.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
......@@ -25,13 +25,13 @@ GEM
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.2.0, < 3.0)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.2)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
......@@ -67,7 +67,7 @@ GEM
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.5)
fastlane (2.121.1)
fastlane (2.125.2)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
......@@ -86,8 +86,8 @@ GEM
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
jwt (~> 2.1.0)
mini_magick (~> 4.5.1)
multi_json
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
......@@ -104,7 +104,7 @@ GEM
xcodeproj (>= 1.8.1, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fourflusher (2.2.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-api-client (0.23.9)
......@@ -117,7 +117,7 @@ GEM
signet (~> 0.9)
google-cloud-core (1.3.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.0.5)
google-cloud-env (1.1.0)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
digest-crc (~> 0.4)
......@@ -153,7 +153,7 @@ GEM
nap (1.1.0)
naturally (2.2.0)
netrc (0.11.0)
os (1.0.0)
os (1.0.1)
plist (3.5.0)
public_suffix (2.0.5)
representable (3.0.4)
......@@ -163,7 +163,7 @@ GEM
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.4.0)
rubyzip (1.2.2)
rubyzip (1.2.3)
security (0.1.3)
signet (0.11.0)
addressable (~> 2.3)
......@@ -178,22 +178,22 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tty-cursor (0.6.1)
tty-screen (0.6.5)
tty-spinner (0.9.0)
tty-cursor (~> 0.6.0)
tty-cursor (0.7.0)
tty-screen (0.7.0)
tty-spinner (0.9.1)
tty-cursor (~> 0.7)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.5.0)
unicode-display_width (1.6.0)
word_wrap (1.0.0)
xcode-install (2.5.0)
claide (>= 0.9.1, < 1.1.0)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.8.2)
xcodeproj (1.10.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
......@@ -208,9 +208,9 @@ PLATFORMS
ruby
DEPENDENCIES
cocoapods (= 1.6.1)
cocoapods (~> 1.7.2)
fastlane
xcode-install
BUNDLED WITH
2.0.1
2.0.2
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -3,7 +3,7 @@
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
parallelizeBuildables = "NO"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
......
# Uncomment this line to define a global platform for your project
platform :ios, "9.0"
platform :ios, '10.0'
# Use frameforks to allow usage of pod written in Swift
use_frameworks!
......@@ -7,7 +7,7 @@ use_frameworks!
# Different flavours of pods to MatrixKit
# The current MatrixKit pod version
$matrixKitVersion = '0.9.8'
$matrixKitVersion = '0.10.1'
# The develop branch version
#$matrixKitVersion = 'develop'
......@@ -43,18 +43,15 @@ def import_MatrixKitAppExtension
if $matrixKitVersion == 'local'
pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
pod 'MatrixSDK/SwiftSupport', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
pod 'MatrixSDK/JingleCallStack', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec'
else
if $matrixKitVersion == 'develop'
pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
pod 'MatrixSDK/SwiftSupport', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
pod 'MatrixSDK/JingleCallStack', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
else
pod 'MatrixKit/AppExtension', $matrixKitVersion
pod 'MatrixSDK/SwiftSupport'
pod 'MatrixSDK/JingleCallStack'
end
end
end
......@@ -63,20 +60,22 @@ end
abstract_target 'RiotPods' do
pod 'GBDeviceInfo', '~> 5.2.0'
pod 'Reusable', '~> 4.0'
pod 'Reusable', '~> 4.1'
pod 'SwiftUTI', :git => 'https://github.com/speramusinc/SwiftUTI.git', :branch => 'master'
# Remove warnings from "bad" pods
pod 'OLMKit', :inhibit_warnings => true
pod 'cmark', :inhibit_warnings => true
pod 'DTCoreText', :inhibit_warnings => true
pod 'zxcvbn-ios'
# Tools
pod 'SwiftGen', '~> 6.1'
pod 'SwiftLint', '~> 0.30.1'
pod 'SwiftLint', '~> 0.33.0'
target "Riot" do
import_MatrixKit
pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
end
target "RiotShareExtension" do
......@@ -98,8 +97,12 @@ post_install do |installer|
# Plus the app does not enable it
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
# Force SwiftUTI Swift version to 5.0 (as there is no code changes to perform for SwiftUTI fork using Swift 4.2)
if target.name.include? 'SwiftUTI'
config.build_settings['SWIFT_VERSION'] = '5.0'
end
end
end
end
......@@ -15,18 +15,19 @@ PODS:
- AFNetworking/UIKit (3.2.1):
- AFNetworking/NSURLSession
- cmark (0.24.1)
- DTCoreText (1.6.21):
- DTCoreText/Core (= 1.6.21)
- DGCollectionViewLeftAlignFlowLayout (1.0.4)
- DTCoreText (1.6.22):
- DTCoreText/Core (= 1.6.22)
- DTFoundation/Core (~> 1.7.5)
- DTFoundation/DTAnimatedGIF (~> 1.7.5)
- DTFoundation/DTHTMLParser (~> 1.7.5)
- DTFoundation/UIKit (~> 1.7.5)
- DTCoreText/Core (1.6.21):
- DTCoreText/Core (1.6.22):
- DTFoundation/Core (~> 1.7.5)
- DTFoundation/DTAnimatedGIF (~> 1.7.5)
- DTFoundation/DTHTMLParser (~> 1.7.5)
- DTFoundation/UIKit (~> 1.7.5)
- DTCoreText/Extension (1.6.21):
- DTCoreText/Extension (1.6.22):
- DTFoundation/Core (~> 1.7.5)
- DTFoundation/DTAnimatedGIF (~> 1.7.5)
- DTFoundation/DTHTMLParser (~> 1.7.5)
......@@ -40,84 +41,92 @@ PODS:
- GBDeviceInfo (5.2.0):
- GBDeviceInfo/Core (= 5.2.0)
- GBDeviceInfo/Core (5.2.0)
- GZIP (1.2.2)
- GZIP (1.2.3)
- HPGrowingTextView (1.1)
- JitsiMeetSDK (2.1.0)
- libbase58 (0.1.4)
- libPhoneNumber-iOS (0.9.13)
- MatrixKit (0.9.8):
- libPhoneNumber-iOS (0.9.15)
- MatrixKit (0.10.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.9.8)
- MatrixSDK (= 0.12.4)
- MatrixKit/AppExtension (0.9.8):
- MatrixKit/Core (= 0.10.1)
- MatrixSDK (= 0.13.0)
- SwiftUTI (~> 1.0.6)
- MatrixKit/AppExtension (0.10.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- DTCoreText/Extension
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.12.4)
- MatrixKit/Core (0.9.8):
- MatrixSDK (= 0.13.0)
- SwiftUTI (~> 1.0.6)
- MatrixKit/Core (0.10.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.12.4)
- MatrixSDK (0.12.4):
- MatrixSDK/Core (= 0.12.4)
- MatrixSDK/Core (0.12.4):
- MatrixSDK (= 0.13.0)
- SwiftUTI (~> 1.0.6)
- MatrixSDK (0.13.0):
- MatrixSDK/Core (= 0.13.0)
- MatrixSDK/Core (0.13.0):
- AFNetworking (~> 3.2.0)
- GZIP (~> 1.2.2)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.0.0)
- OLMKit (~> 3.1.0)
- Realm (~> 3.13.1)
- MatrixSDK/JingleCallStack (0.12.4):
- MatrixSDK/JingleCallStack (0.13.0):
- JitsiMeetSDK (~> 2.1.0)
- MatrixSDK/Core
- WebRTC (= 63.11.20455)
- MatrixSDK/SwiftSupport (0.12.4):
- MatrixSDK/SwiftSupport (0.13.0):
- MatrixSDK/Core
- OLMKit (3.0.0):
- OLMKit/olmc (= 3.0.0)
- OLMKit/olmcpp (= 3.0.0)
- OLMKit/olmc (3.0.0)
- OLMKit/olmcpp (3.0.0)
- OLMKit (3.1.0):
- OLMKit/olmc (= 3.1.0)
- OLMKit/olmcpp (= 3.1.0)
- OLMKit/olmc (3.1.0)
- OLMKit/olmcpp (3.1.0)
- Realm (3.13.1):
- Realm/Headers (= 3.13.1)
- Realm/Headers (3.13.1)
- Reusable (4.0.5):
- Reusable/Storyboard (= 4.0.5)
- Reusable/View (= 4.0.5)
- Reusable/Storyboard (4.0.5)
- Reusable/View (4.0.5)
- Reusable (4.1.0):
- Reusable/Storyboard (= 4.1.0)
- Reusable/View (= 4.1.0)
- Reusable/Storyboard (4.1.0)
- Reusable/View (4.1.0)
- SwiftGen (6.1.0)
- SwiftLint (0.30.1)
- WebRTC (63.11.20455)
- SwiftLint (0.33.1)
- SwiftUTI (1.0.7)
- zxcvbn-ios (1.0.4)
DEPENDENCIES:
- cmark
- DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
- DTCoreText
- GBDeviceInfo (~> 5.2.0)
- MatrixKit (= 0.9.8)
- MatrixKit/AppExtension (= 0.9.8)
- MatrixKit (= 0.10.1)
- MatrixKit/AppExtension (= 0.10.1)
- MatrixSDK/JingleCallStack
- MatrixSDK/SwiftSupport
- OLMKit
- Reusable (~> 4.0)
- Reusable (~> 4.1)
- SwiftGen (~> 6.1)
- SwiftLint (~> 0.30.1)
- SwiftLint (~> 0.33.0)
- SwiftUTI (from `https://github.com/speramusinc/SwiftUTI.git`, branch `master`)
- zxcvbn-ios
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- AFNetworking
- cmark
- DGCollectionViewLeftAlignFlowLayout
- DTCoreText
- DTFoundation
- GBDeviceInfo
- GZIP
- HPGrowingTextView
- JitsiMeetSDK
- libbase58
- libPhoneNumber-iOS
- MatrixKit
......@@ -127,29 +136,40 @@ SPEC REPOS:
- Reusable
- SwiftGen
- SwiftLint
- WebRTC
- zxcvbn-ios
EXTERNAL SOURCES:
SwiftUTI:
:branch: master
:git: https://github.com/speramusinc/SwiftUTI.git
CHECKOUT OPTIONS:
SwiftUTI:
:commit: b6b46942fb3aad819610851f62a70e17a528444e
:git: https://github.com/speramusinc/SwiftUTI.git
SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
cmark: ec0275215b504780287b6fca360224e384368af8
DTCoreText: e5d688cffc9f6a61eddd1a4f94e2046851230de3
cmark: 1d9ad0375e3b9fa281732e992467903606015520
DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
DTCoreText: ad5135357a0e792f735970ed67d3ecda8b602d3d
DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df
GBDeviceInfo: 2c65ceb9404f9079264d4c238f5b81916fdfc5e2
GZIP: 12374d285e3b5d46cfcd480700fcfc7e16caf4f1
GZIP: af5c90ef903776a7e9afe6ebebd794a84a2929d4
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
JitsiMeetSDK: 3e66564af7f38a19142338955dd7f581801852b3
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
MatrixKit: 098ddd270d1dec86a85ea93a85a00e37b2d80c11
MatrixSDK: 310efb69f70b4d7772f6f134b06fbb9ec238e6a7
OLMKit: 88eda69110489f817d59bcb4353b7c247570aa4f
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
MatrixKit: f8224de32ca8b6e4c54a2654369cedec7744dc6d
MatrixSDK: 6886e7234c650408db5876b44a7f7608c865ce30
OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
Realm: 50071da38fe079e0735e47c9f2eae738c68c5996
Reusable: 188be1a54ac0691bc66e5bb24ec6eb91971b315b
Reusable: 82be188f29d96dc5eff0db7b2393bcc08d2cdd5b
SwiftGen: f872ca75cbd17bf7103c17f13dcfa0d9a15667b0
SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
WebRTC: f2a6203584745fe53532633397557876b5d71640
SwiftLint: 9fc1143bbacec37f94994a7d0d2a85b2154b6294
SwiftUTI: 917993c124f8eac25e88ced0202fc58d7eb50fa8
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
PODFILE CHECKSUM: fe2857ebb5442ed605031efb48993ab657c00fdf
PODFILE CHECKSUM: 199e2a875b9ca7ebda48c1589533c93d1c9a2613
COCOAPODS: 1.6.1
COCOAPODS: 1.7.5
......@@ -17,6 +17,7 @@
#import <UIKit/UIKit.h>
#import <MatrixKit/MatrixKit.h>
#import <UserNotifications/UserNotifications.h>
#import "MasterTabBarController.h"
#import "JitsiViewController.h"
......@@ -36,7 +37,7 @@ extern NSString *const kAppDelegateDidTapStatusBarNotification;
*/
extern NSString *const kAppDelegateNetworkStatusDidChangeNotification;
@interface AppDelegate : UIResponder <UIApplicationDelegate, MXKCallViewControllerDelegate, UISplitViewControllerDelegate, UINavigationControllerDelegate, JitsiViewControllerDelegate>
@interface AppDelegate : UIResponder <UIApplicationDelegate, MXKCallViewControllerDelegate, UISplitViewControllerDelegate, UINavigationControllerDelegate, JitsiViewControllerDelegate, UNUserNotificationCenterDelegate>
{
BOOL isPushRegistered;
......@@ -118,7 +119,7 @@ extern NSString *const kAppDelegateNetworkStatusDidChangeNotification;
Log out all the accounts without confirmation.
Show the authentication screen on successful logout.
@param sendLogoutRequest Indicate whether send logout request to home server.
@param sendLogoutRequest Indicate whether send logout request to homeserver.
@param completion the block to execute at the end of the operation.
*/
- (void)logoutSendingRequestServer:(BOOL)sendLogoutServerRequest
......@@ -142,6 +143,11 @@ extern NSString *const kAppDelegateNetworkStatusDidChangeNotification;
#pragma mark - Matrix Room handling
// Show a room and jump to the given event if event id is not nil otherwise go to last messages.
- (void)showRoom:(NSString*)roomId andEventId:(NSString*)eventId withMatrixSession:(MXSession*)mxSession restoreInitialDisplay:(BOOL)restoreInitialDisplay completion:(void (^)(void))completion;
- (void)showRoom:(NSString*)roomId andEventId:(NSString*)eventId withMatrixSession:(MXSession*)mxSession restoreInitialDisplay:(BOOL)restoreInitialDisplay;
- (void)showRoom:(NSString*)roomId andEventId:(NSString*)eventId withMatrixSession:(MXSession*)mxSession;
// Creates a new direct chat with the provided user id
......
This diff is collapsed.
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "room_context_menu_copy.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_copy@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_copy@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "room_context_menu_edit.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_edit@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_edit@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "room_context_menu_more.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_more@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_more@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "room_context_menu_reply.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_reply@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "room_context_menu_reply@3x.png",
"scale" : "3x"
}