diff --git a/CHANGES.rst b/CHANGES.rst
index 50184430e..931822f61 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+Changes in 0.7.1 (2018-08-17)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.8.1).
+
+Bug fix:
+ * Empty app if initial /sync fails (#1975).
+ * Direct rooms can be lost on an initial /sync (vector-im/riot-ios/issues/1983).
+ * Fix possible race conditions in direct rooms management.
+
Changes in 0.7.0 (2018-08-10)
===============================================
diff --git a/Podfile b/Podfile
index f6d10c971..736793f20 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git'
# Different flavours of pods to MatrixKit
# The current MatrixKit pod version
-$matrixKitVersion = '0.8.0'
+$matrixKitVersion = '0.8.1'
# The develop branch version
#$matrixKitVersion = 'develop'
diff --git a/Podfile.lock b/Podfile.lock
index 6117fd623..68496c18c 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -43,34 +43,34 @@ PODS:
- GZIP (1.2.1)
- HPGrowingTextView (1.1)
- libPhoneNumber-iOS (0.9.13)
- - MatrixKit (0.8.0):
+ - MatrixKit (0.8.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- - MatrixKit/Core (= 0.8.0)
- - MatrixSDK (= 0.11.0)
- - MatrixKit/AppExtension (0.8.0):
+ - MatrixKit/Core (= 0.8.1)
+ - MatrixSDK (= 0.11.1)
+ - MatrixKit/AppExtension (0.8.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- DTCoreText/Extension
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- - MatrixSDK (= 0.11.0)
- - MatrixKit/Core (0.8.0):
+ - MatrixSDK (= 0.11.1)
+ - MatrixKit/Core (0.8.1):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- - MatrixSDK (= 0.11.0)
- - MatrixSDK (0.11.0):
- - MatrixSDK/Core (= 0.11.0)
- - MatrixSDK/Core (0.11.0):
+ - MatrixSDK (= 0.11.1)
+ - MatrixSDK (0.11.1):
+ - MatrixSDK/Core (= 0.11.1)
+ - MatrixSDK/Core (0.11.1):
- AFNetworking (~> 3.2.0)
- GZIP (~> 1.2.1)
- OLMKit (~> 2.3.0)
- Realm (~> 3.7.4)
- - MatrixSDK/JingleCallStack (0.11.0):
+ - MatrixSDK/JingleCallStack (0.11.1):
- MatrixSDK/Core
- WebRTC (= 63.11.20455)
- OLMKit (2.3.0):
@@ -90,8 +90,8 @@ DEPENDENCIES:
- cmark
- DTCoreText
- GBDeviceInfo (~> 5.2.0)
- - MatrixKit (= 0.8.0)
- - MatrixKit/AppExtension (= 0.8.0)
+ - MatrixKit (= 0.8.1)
+ - MatrixKit/AppExtension (= 0.8.1)
- MatrixSDK/JingleCallStack
- OLMKit
- PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
@@ -131,13 +131,13 @@ SPEC CHECKSUMS:
GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
- MatrixKit: 836da10ae05005c2539911a046987f795f7bd634
- MatrixSDK: 9d8219d72cee12d40f5077c6f6b7a1dd591c2578
+ MatrixKit: 8b0d82633286ba9be7b17adfeca003bed644cffe
+ MatrixSDK: 5562f0116b2b08f74b81e9df365a07151ca76584
OLMKit: dd79cdc5fab9ec04c940a901e025195b7801f306
PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
Realm: 9eaecad54712d6246d08ba34c10f354e4715d7d3
WebRTC: f2a6203584745fe53532633397557876b5d71640
-PODFILE CHECKSUM: f6598a5961337b27b4348d537ed315d2596d5485
+PODFILE CHECKSUM: c1a7c995727b5697ab109e65cbfe947f5d5cda55
COCOAPODS: 1.5.3
diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index 8047f6841..5ca74f753 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -599,6 +599,18 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
}
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+
+ // Check if an initial sync failure occured while the app was in background
+ MXSession *mainSession = self.mxSessions.firstObject;
+ if (mainSession.state == MXSessionStateInitialSyncFailed)
+ {
+ // Inform the end user why the app appears blank
+ NSError *error = [NSError errorWithDomain:NSURLErrorDomain
+ code:NSURLErrorCannotConnectToHost
+ userInfo:@{NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"homeserver_connection_lost", @"Vector", nil)}];
+
+ [self showErrorAsAlert:error];
+ }
// Register to GDPR consent not given notification
[self registerUserConsentNotGivenNotification];
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 08b8d3258..7985cbeb5 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -537,6 +537,7 @@
"today" = "Today";
"yesterday" = "Yesterday";
"network_offline_prompt" = "The Internet connection appears to be offline.";
+"homeserver_connection_lost" = "Could not connect to the homeserver.";
"public_room_section_title" = "Public Rooms (at %@):";
"bug_report_prompt" = "The application has crashed last time. Would you like to submit a crash report?";
"rage_shake_prompt" = "You seem to be shaking the phone in frustration. Would you like to submit a bug report?";
diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
index b6e65fd52..446dd004c 100644
--- a/Riot/SupportingFiles/Info.plist
+++ b/Riot/SupportingFiles/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.7.0
+ 0.7.1
CFBundleSignature
????
CFBundleVersion
- 0.7.0
+ 0.7.1
ITSAppUsesNonExemptEncryption
ITSEncryptionExportComplianceCode
diff --git a/RiotShareExtension/SupportingFiles/Info.plist b/RiotShareExtension/SupportingFiles/Info.plist
index e0876d88c..a5061299f 100644
--- a/RiotShareExtension/SupportingFiles/Info.plist
+++ b/RiotShareExtension/SupportingFiles/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.7.0
+ 0.7.1
CFBundleVersion
- 0.7.0
+ 0.7.1
NSExtension
NSExtensionAttributes
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index fd88a4248..2d9b1c51d 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.7.0
+ 0.7.1
CFBundleVersion
- 0.7.0
+ 0.7.1
NSExtension
NSExtensionAttributes