Merge pull request #2532 from RocketChat/develop

[RELEASE] Merge DEVELOP into BETA

Author: rafaelks

Podfile

@@ -77,20 +77,26 @@ end
 post_install do |installer|
   swift3Targets = ['MobilePlayer', 'RCMarkdownParser']
   swift42Targets = ['SwipeCellKit']
+
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['SWIFT_VERSION'] = '4.1'
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+      config.build_settings['ARCHS'] = 'arm64'
+
       if config.name == 'Debug'
         config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
       else
         config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Owholemodule'
       end
     end
+
     if swift3Targets.include? target.name
       target.build_configurations.each do |config|
         config.build_settings['SWIFT_VERSION'] = '3.1'
       end
     end
+
     if swift42Targets.include? target.name
       target.build_configurations.each do |config|
         config.build_settings['SWIFT_VERSION'] = '4.2'

Podfile.lock

@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
     :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
   RocketChatViewController:
-    :commit: 918d9d91fb856b836795e673b112dc2624f2be06
+    :commit: a887982ea898a9ee0620751923988bb77779dd38
     :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -194,6 +194,6 @@ SPEC CHECKSUMS:
   SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
   SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
 
-PODFILE CHECKSUM: 5d62982fe6d8cd234f28edafc23b27595439d854
+PODFILE CHECKSUM: 250e7f21d8e197ec35fe8d665ee0d11e46dd9082
 
 COCOAPODS: 1.5.3

Pods/Manifest.lock

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.0</string>
+	<string>3.3.0</string>
 	<key>CFBundleVersion</key>
-	<string>223</string>
+	<string>234</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>

Pods/Pods.xcodeproj/project.pbxproj

@@ -0,0 +1,34 @@
+/* 
+  Localizable.strings
+  Rocket.Chat
+
+  Created by Matheus Cardoso on 2/28/18.
+  Copyright © 2018 Rocket.Chat. All rights reserved.
+*/
+
+"global.ok" = "Ok";
+
+"alert.no_servers.title" = "No servers";
+"alert.no_servers.message" = "You need to join at least one Rocket.Chat server in order to share something.";
+
+"servers.title" = "Servers";
+
+"rooms.title" = "Select Rooms";
+"rooms.section.server" = "Select server";
+"rooms.section.favorites" = "Favorites";
+"rooms.section.channels" = "Channels";
+"rooms.section.groups" = "Private Groups";
+"rooms.section.directMessages" = "Direct Messages";
+
+"compose.title" = "Share";
+"compose.send" = "Send";
+"compose.cancel" = "Cancel";
+"compose.destination.to" = "To: ";
+"compose.file.name.placeholder" = "File name";
+"compose.file.description.placeholder" = "File description";
+
+"report.success.title" = "Success";
+"report.success.message" = "Shared your content successfully.";
+"report.error.title" = "Error";
+"report.error.message" = "Something wrong happened while sending your content.";
+"report.cancelled.message" = "You cancelled the request. The message wasn't sent.";

Pods/RocketChatViewController/RocketChatViewController/Classes/RocketChatViewController.swift

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Rocket.Chat.ShareExtension/Info.plist

@@ -73,33 +73,25 @@ struct MessagesClient: APIClient {
         let request = SendMessageRequest(
             id: id,
             roomId: subscription.rid,
-            text: message.text
+            text: message.text,
+            messageType: message.internalType.isEmpty ? nil : message.internalType
         )
 
         api.fetch(request) { response in
             switch response {
             case .resource(let resource):
                 guard let message = resource.raw?["message"] else { return }
                 updateMessage(json: message)
-            case .error(let error):
-                switch error {
-                case .version:
-                    SubscriptionManager.sendTextMessage(message, completion: { response in
-                        DispatchQueue.main.async {
-                            updateMessage(json: response.result["result"])
-                        }
-                    })
-                default:
-                    setMessageOffline()
-                }
+            case .error:
+                setMessageOffline()
             }
 
         }
     }
 
-    func sendMessage(text: String, subscription: UnmanagedSubscription, id: String = String.random(18), user: User? = AuthManager.currentUser(), realm: Realm? = Realm.current) {
+    func sendMessage(text: String, internalType: String? = nil, subscription: UnmanagedSubscription, id: String = String.random(18), user: User? = AuthManager.currentUser(), realm: Realm? = Realm.current) {
         let message = Message()
-        message.internalType = ""
+        message.internalType = internalType ?? ""
         message.updatedAt = nil
         message.createdAt = Date.serverDate
         message.text = text
@@ -230,7 +222,6 @@ struct MessagesClient: APIClient {
         return true
     }
 
-    // swiftlint:disable function_body_length
     @discardableResult
     func reactMessage(_ message: Message, emoji: String, user: User? = AuthManager.currentUser(), realm: Realm? = Realm.current) -> Bool {
         guard let id = message.identifier, let username = user?.username else {
@@ -281,22 +272,8 @@ struct MessagesClient: APIClient {
                         subscriptionType: message.subscription?.type.rawValue ?? ""
                     )
                 )
-            case .error(let error):
-                switch error {
-                case .version:
-                    // version fallback
-                    MessageManager.react(message, emoji: emoji, completion: { _ in
-                        DispatchQueue.main.async {
-                            AnalyticsManager.log(
-                                event: .reaction(
-                                    subscriptionType: message.subscription?.type.rawValue ?? ""
-                                )
-                            )
-                        }
-                    })
-                default:
-                    Alert.defaultError.present()
-                }
+            case .error:
+                Alert.defaultError.present()
             }
         }