Adding upload content and get downloadable url to SDK, version bump to alpha 63

Author: hannojg

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.0-alpha63
+
+* Added `uploadContent` and `contentGetDownloadableUrl` to the SDK
+
 ## 1.0.0-alpha60
 
 * Upgraded android matrix SDK to 0.19.35

android/src/main/java/de/hannojg/MatrixSdkModule.java

@@ -844,6 +844,21 @@ public void onUploadComplete(String uploadId, String contentUri) {
         }
     }
 
+    @ReactMethod
+    public void contentGetDownloadableUrl(String matrixContentUri, Promise promise) {
+        if (mxSession == null) {
+            promise.reject(E_MATRIX_ERROR, "client is not connected yet");
+            return;
+        }
+
+        String url = mxSession.getContentManager().getDownloadableUrl(matrixContentUri, false);
+        if (url != null) {
+            promise.resolve(url);
+        } else {
+            promise.reject(E_MATRIX_ERROR, "Failed to resolve content url");
+        }
+    }
+
     //* ******************************************
     //*  PUSH NOTIFICATIONS
     //* ******************************************

ios/MatrixSdk.m

@@ -82,6 +82,10 @@ + (BOOL)requiresMainQueueSetup
 
 RCT_EXTERN_METHOD(uploadContent:(NSString *)fileUri fileName:(NSString *)fileName mimeType:(NSString *)mimeType uploadId:(NSString *)uploadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(contentGetDownloadableUrl:(NSString *)matrixContentUri resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(downloadContent:(NSString *)matrixContentUri mimeType:(NSString *)mimeType folder:(NSString *)folder resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(sendTyping:(NSString *)roomId isTyping:(nonnull BOOL *)isTyping timeout:(nonnull NSNumber *)timeout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(updatePresence:(nonnull BOOL *)isOnline resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)

ios/RNMatrixSDK.swift

@@ -907,10 +907,41 @@ class RNMatrixSDK: RCTEventEmitter {
                 uploadId: url
             ])
         }, failure: { (error) in
-
+            reject(nil, "Failed to upload", error)
         })
     }
 
+    @objc(contentGetDownloadableUrl:resolver:rejecter:)
+    func contentGetDownloadableUrl(matrixContentUri: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        if mxSession == nil {
+            reject(E_MATRIX_ERROR, "client is not connected yet", nil)
+            return
+        }
+
+        let url = mxSession.mediaManager.url(ofContent: matrixContentUri)
+        if ((url) != nil) {
+            resolve(url)
+        } else {
+            reject(nil, "Failed to get content uri", nil)
+        }
+    }
+
+    @objc(downloadContent:mimeType:folder:resolver:rejecter:)
+    func downloadContent(matrixContentUri: String, mimeType: String, folder: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        if mxSession == nil {
+            reject(E_MATRIX_ERROR, "client is not connected yet", nil)
+            return
+        }
+
+        let mediaLoader = mxSession.mediaManager.downloadMedia(fromMatrixContentURI: matrixContentUri, withType: mimeType, inFolder: folder, success: { (fileUri) in
+            resolve(fileUri)
+        }) { (e) in
+            reject(nil, "Failed to download", e)
+        }
+
+        print("[DOWNLOAD NATIVE IOS] download url: " + (mediaLoader?.downloadMediaURL ?? "NO DOWNLOAD URL"))
+    }
+
     @objc(sendTyping:isTyping:timeout:resolver:rejecter:)
     func sendTyping(roomId: String, isTyping: Bool, timeout: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         if mxSession == nil {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-matrix-sdk",
   "title": "React Native Matrix Sdk",
-  "version": "1.0.0",
+  "version": "1.0.0-alpha63",
   "description": "React Native SDK for Matrix.org",
   "main": "index.js",
   "types": "./types/index.d.ts",

types/index.d.ts

@@ -219,7 +219,14 @@ declare module 'react-native-matrix-sdk' {
     setUserDisplayName(displayName: string): Promise<void>;
 
     /**
-     * Uploads content to the matrix content respository of the connected homeserver.
+     * Returns for a matrix content uri (mxc://...) the downloadable
+     * server url of the content. Currently doesn't support encryption.
+     * @param matrixContentUrl The matrix content url to resolve
+     */
+    contentGetDownloadableUrl(matrixContentUrl: String): Promise<string>
+
+    /**
+     * Uploads content to the matrix content repository of the connected homeserver.
      * @return {@see #SuccessUploadResponse}
      * @param fileUri the absolute file path to the file to be uploaded
      * @param fileName the file name of the file