Merge remote-tracking branch 'origin/release-v0.3.5'

CHANGES.rst

@@ -1,3 +1,22 @@
+Changes in MatrixKit in 0.3.5 (2016-04-08)
+===============================================
+
+Improvements:
+ * MXKAccountManager: API change - [openSessionForActiveAccounts] is replaced by [prepareSessionForActiveAccounts]. This new method checks for each enabled account if a matrix session is already opened. It opens a matrix session for each enabled account which doesn't have a session.
+ * MXK3PID: support new email binding mechanism.
+ * MXKAuthenticationViewController, MXKAuthInputsView: Support registration based on MXAuthenticationSession class.
+ * MXKAuthenticationRecaptchaWebView: Display a reCAPTCHA widget into a webview.
+ * MXKAccountDetailsViewController: Handle the linked emails.
+ * MXKAccount: Store (permanently) 3PIDs.
+ * MXKRecentsDataSource: Remove room notifications and room tags handling (These operations are handled by inherited classes).
+ * MXKContactManager: List email addresses from the local address book (see 'localEmailContacts').
+ * MXKAccountManager: Added accountKnowingRoomWithRoomIdOrAlias method.
+
+Bug fixes:
+ * Search: 'no result' label is persistent #75.
+ * MXKAccount: the push gateway URL must be configurable #76.
+ * Multiple invitations on Start Chat action.
+
 Changes in MatrixKit in 0.3.4 (2016-03-17)
 ===============================================
 

MatrixKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.3.4"
+  s.version      = "0.3.5"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -17,13 +17,13 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "7.0"
 
-  s.source       = { :git => "https://github.com/matrix-org/matrix-ios-kit.git", :tag => "v0.3.4" }
+  s.source       = { :git => "https://github.com/matrix-org/matrix-ios-kit.git", :tag => "v0.3.5" }
   s.source_files  = "MatrixKit", "MatrixKit/**/*.{h,m}"
   s.resources	 = "MatrixKit/**/*.{xib}", "MatrixKit/Assets/MatrixKitAssets.bundle"
 
   s.requires_arc  = true
 
-  s.dependency 'MatrixSDK', '~> 0.6.4'
+  s.dependency 'MatrixSDK', '~> 0.6.5'
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.8.7'
 

MatrixKit.xcodeproj/project.pbxproj

@@ -61,6 +61,7 @@
 		F00FA8781C08A51B00E25826 /* MXKRoomOutgoingTextMsgBubbleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F00FA86F1C08A51B00E25826 /* MXKRoomOutgoingTextMsgBubbleCell.xib */; };
 		F00FA8791C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F00FA8711C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m */; };
 		F00FA87A1C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F00FA8721C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib */; };
+		F011FA681CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = F011FA671CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.m */; };
 		F012674A1AF8A9440067D962 /* MXK3PID.m in Sources */ = {isa = PBXBuildFile; fileRef = F01267491AF8A9440067D962 /* MXK3PID.m */; };
 		F01449AB1B53FA7600EA7D73 /* MXKPushRuleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F01449A61B53FA7600EA7D73 /* MXKPushRuleTableViewCell.m */; };
 		F01449AC1B53FA7600EA7D73 /* MXKPushRuleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F01449A71B53FA7600EA7D73 /* MXKPushRuleTableViewCell.xib */; };
@@ -300,6 +301,8 @@
 		F00FA8701C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h; sourceTree = "<group>"; };
 		F00FA8711C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m; sourceTree = "<group>"; };
 		F00FA8721C08A51B00E25826 /* MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib; sourceTree = "<group>"; };
+		F011FA661CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKAuthenticationRecaptchaWebView.h; sourceTree = "<group>"; };
+		F011FA671CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKAuthenticationRecaptchaWebView.m; sourceTree = "<group>"; };
 		F01267481AF8A9440067D962 /* MXK3PID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXK3PID.h; sourceTree = "<group>"; };
 		F01267491AF8A9440067D962 /* MXK3PID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXK3PID.m; sourceTree = "<group>"; };
 		F01449A51B53FA7600EA7D73 /* MXKPushRuleTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKPushRuleTableViewCell.h; sourceTree = "<group>"; };
@@ -905,6 +908,8 @@
 				F06E76921AF0FED000980E5A /* MXKAuthInputsView.m */,
 				F06E76931AF0FED000980E5A /* MXKAuthenticationFallbackWebView.h */,
 				F06E76941AF0FED000980E5A /* MXKAuthenticationFallbackWebView.m */,
+				F011FA661CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.h */,
+				F011FA671CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.m */,
 			);
 			path = Authentication;
 			sourceTree = "<group>";
@@ -1440,6 +1445,7 @@
 				328AC48C1AA760520044A6FB /* MXKRoomOutgoingBubbleTableViewCell.m in Sources */,
 				32CEE21F1AB1A57E00F7C74D /* MXKEventFormatter.m in Sources */,
 				3230A3751ACADC1800CC57F5 /* MXKRoomDataSourceManager.m in Sources */,
+				F011FA681CA3F43C009EA677 /* MXKAuthenticationRecaptchaWebView.m in Sources */,
 				F0CF98E11B0B7FDC00EAE373 /* MXKTableViewCellWithLabelAndSwitch.m in Sources */,
 				F02528961C1092D300E1FE1B /* MXKCollectionViewCell.m in Sources */,
 				F0F148A61AB08F48005F5D4A /* MXKSampleJSQRoomDataSource.m in Sources */,

MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings

@@ -45,13 +45,16 @@
 "login_error_login_email_not_yet" = "The email link which has not been clicked yet";
 "login_use_fallback" = "Use fallback page";
 "login_leave_fallback" = "Cancel";
+"login_invalid_param" = "Invalid parameter";
+"register_error_title" = "Registration Failed";
 
 // Action
 "no" = "No";
 "yes" = "Yes";
 "abort" = "Abort";
 "back" = "Back";
 "close" = "Close";
+"continue" = "Continue";
 "discard" = "Discard";
 "dismiss" = "Dismiss";
 "retry" = "Retry";
@@ -117,10 +120,15 @@
 "account_link_email" = "Link Email";
 "account_linked_emails" = "Linked emails";
 
+"account_email_validation_title" = "Verification Pending";
+"account_email_validation_message" = "Please check your email and click on the link it contains. Once this is done, click continue.";
+"account_email_validation_error" = "Unable to verify email address. Please check your email and click on the link it contains. Once this is done, click continue";
+
 "account_error_display_name_change_failed" = "Display name change failed";
 "account_error_picture_change_failed" = "Picture change failed";
-"account_error_email_link_failed" = "Failed to link email";
 "account_error_matrix_session_is_not_opened" = "Matrix session is not opened";
+"account_error_email_wrong_title" = "Invalid Email Address";
+"account_error_email_wrong_description" = "This doesn't appear to be a valid email address";
 
 // Room creation
 "room_creation_name_title" = "Room name:";

MatrixKit/Controllers/MXKAccountDetailsViewController.h

@@ -52,9 +52,7 @@ typedef void (^blockMXKAccountDetailsViewController_onReadyToLeave)();
     MXK3PID  *submittedEmail;
     UIButton *emailSubmitButton;
     UITextField *emailTextField;
-    UIButton *emailTokenSubmitButton;
-    UITextField *emailTokenTextField;
-
+
     // Notifications
     UISwitch *apnsNotificationsSwitch;
     UISwitch *inAppNotificationsSwitch;