Merge pull request #540 from vector-im/release-v0.1.16

Release v0.1.16
element-hq · Aug 25, 2016 · 355a795 · 355a795
2 parents 13028a7 + 318e8db
commit 355a795
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 20 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,13 @@
+Changes in Vector iOS in 0.1.16 (2016-08-25)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.15).
+
+Bug fixes:
+ * Rooms list: Fix crash when computing recents.
+ * Settings: Fix crash when logging out.
+
 Changes in Vector iOS in 0.1.15 (2016-08-25)
 ===============================================
 

diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ target "Vector" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Vector has been built
-pod 'MatrixKit', '0.3.14'
+pod 'MatrixKit', '0.3.15'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'

diff --git a/Podfile.lock b/Podfile.lock
@@ -32,7 +32,7 @@ PODS:
   - GoogleAnalytics (3.16.0)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.8.16)
-  - MatrixKit (0.3.14):
+  - MatrixKit (0.3.15):
     - DTCoreText (~> 1.6.17)
     - GHMarkdownParser (~> 0.1.2)
     - HPGrowingTextView (~> 1.1)
@@ -45,7 +45,7 @@ PODS:
 DEPENDENCIES:
   - GBDeviceInfo (~> 4.1.0)
   - GoogleAnalytics
-  - MatrixKit (= 0.3.14)
+  - MatrixKit (= 0.3.15)
   - WebRTC (= 1.0.13807)
 
 SPEC CHECKSUMS:
@@ -57,10 +57,10 @@ SPEC CHECKSUMS:
   GoogleAnalytics: 3de986b2fa29012c69fa415566006a9c9cf25320
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: acb5805f67892db37adc3440290a367923672b51
-  MatrixKit: c8855ccd0186e2e2c1dd359767d87a056bdcb17e
+  MatrixKit: e1ad20b1570cdd1b847af921e940910bd4cc3a97
   MatrixSDK: d848e4050411f66061f98b77f8bcb1a1eca377a2
   WebRTC: 5263e2983d21b6c53e0e6859aaf8aabeee6bafdf
 
-PODFILE CHECKSUM: d21a2f5518b49b8812b1a9cfa94a094aa41e17c8
+PODFILE CHECKSUM: beaabaf63d7ef87b4561b160e55c7a0b8f0c927c
 
 COCOAPODS: 1.0.1
diff --git a/Vector/Info.plist b/Vector/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.15</string>
+	<string>0.1.16</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Vector/ViewController/SettingsViewController.m b/Vector/ViewController/SettingsViewController.m
@@ -561,8 +561,15 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
     }
     else if (section == SETTINGS_SECTION_IGNORED_USERS_INDEX)
     {
-        MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
-        count = session.ignoredUsers.count;
+        if ([AppDelegate theDelegate].mxSessions.count > 0)
+        {
+            MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
+            count = session.ignoredUsers.count;
+        }
+        else
+        {
+            count = 0;
+        }
     }
     else if (section == SETTINGS_SECTION_ADVANCED_INDEX)
     {
@@ -1027,16 +1034,17 @@ - (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSectio
     }
     else if (section == SETTINGS_SECTION_IGNORED_USERS_INDEX)
     {
-        MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
-        if (session.ignoredUsers.count)
-        {
-            return NSLocalizedStringFromTable(@"settings_ignored_users", @"Vector", nil);
-        }
-        else
+        if ([AppDelegate theDelegate].mxSessions.count > 0)
         {
-            // Hide this section
-            return nil;
+            MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
+            if (session.ignoredUsers.count)
+            {
+                return NSLocalizedStringFromTable(@"settings_ignored_users", @"Vector", nil);
+            }
         }
+
+        // Hide this section
+        return nil;
     }
     else if (section == SETTINGS_SECTION_ADVANCED_INDEX)
     {
@@ -1108,11 +1116,14 @@ - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSIntege
 {
     if (section == SETTINGS_SECTION_IGNORED_USERS_INDEX)
     {
-        MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
-        if (session.ignoredUsers.count == 0)
+        if ([AppDelegate theDelegate].mxSessions.count > 0)
         {
-            // Hide this section
-            return SECTION_TITLE_PADDING_WHEN_HIDDEN;
+            MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];
+            if (session.ignoredUsers.count == 0)
+            {
+                // Hide this section
+                return SECTION_TITLE_PADDING_WHEN_HIDDEN;
+            }
         }
     }