Merge branch 'release/0.13.9/master'

matrix-org · Feb 3, 2021 · 445229c · 445229c
2 parents b9a6326 + c622f93
commit 445229c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,30 @@
+Changes in 0.13.9 (2021-02-03)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * Login screen: Unexpected request to access the contact book (vector-im/element-ios/issues/3984).
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixSDK version ([v0.17.11](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.17.11)).
+
 Changes in 0.13.8 (2021-01-27)
 =================================================
 

diff --git a/MatrixKit.podspec b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
  s.name = "MatrixKit"
- s.version = "0.13.8"
+ s.version = "0.13.9"
  s.summary = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
  s.description = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
  s.swift_version = '5.0'
 
- s.dependency 'MatrixSDK', "= 0.17.10"
+ s.dependency 'MatrixSDK', "= 0.17.11"
  s.dependency 'HPGrowingTextView', '~> 1.1'
  s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
  s.dependency 'DTCoreText', '~> 1.6.23'

diff --git a/MatrixKit/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.13.8";
+NSString *const MatrixKitVersion = @"0.13.9";
diff --git a/MatrixKit/Models/Contact/MXKContactManager.m b/MatrixKit/Models/Contact/MXKContactManager.m
@@ -1521,7 +1521,12 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
  dispatch_async(dispatch_get_main_queue(), ^{
 
  [self internationalizePhoneNumbers:[[MXKAppSettings standardAppSettings] phonebookCountryCode]];
- [self refreshLocalContacts];
+
+ // Refresh local contacts if we have some
+ if (!self->localContactByContactID)
+ {
+ [self refreshLocalContacts];
+ }
 
  });
  }

diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
  # Different flavours of pods to Matrix SDK
  # The tagged version on which this version of MatrixKit has been built
- pod 'MatrixSDK', '= 0.17.10'
+ pod 'MatrixSDK', '= 0.17.11'
 
  # The lastest release available on the CocoaPods repository
  #pod 'MatrixSDK'

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,9 +39,9 @@ PODS:
  - JSQSystemSoundPlayer (2.0.1)
  - libbase58 (0.1.4)
  - libPhoneNumber-iOS (0.9.15)
- - MatrixSDK (0.17.10):
- - MatrixSDK/Core (= 0.17.10)
- - MatrixSDK/Core (0.17.10):
+ - MatrixSDK (0.17.11):
+ - MatrixSDK/Core (= 0.17.11)
+ - MatrixSDK/Core (0.17.11):
  - AFNetworking (~> 4.0.0)
  - GZIP (~> 1.3.0)
  - libbase58 (~> 0.1.4)
@@ -62,7 +62,7 @@ DEPENDENCIES:
  - HPGrowingTextView (~> 1.1)
  - JSQMessagesViewController (~> 7.2.0)
  - libPhoneNumber-iOS (~> 0.9.13)
- - MatrixSDK (= 0.17.10)
+ - MatrixSDK (= 0.17.11)
 
 SPEC REPOS:
  trunk:
@@ -91,10 +91,10 @@ SPEC CHECKSUMS:
  JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
  libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
  libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
- MatrixSDK: cd11675c38dcb684843e922026ecb620251e148e
+ MatrixSDK: 55e0b78c2a5cdb48bdcff9f21c159f57fd803dc3
  OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
  Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
 
-PODFILE CHECKSUM: f507db05f6461576628e85347b9c8bc0de330bee
+PODFILE CHECKSUM: e276698595241edbe816106c46bdbda969a7f845
 
 COCOAPODS: 1.10.0