sharing: Add functionality to share multiple files to zulip android.

AkashDhiman · AkashDhiman · commit 0ef352bdc903 · 2021-04-23T03:20:11.000+05:30
This commit changes the param structure that we pass to share screen
from the native code, in order to be more compatible with multiple file
sharing.

It also makes user interface changes to display list of multiple
content.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -56,6 +56,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="*/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
         </activity>
 
         <service android:name=".notifications.NotificationIntentService" />
diff --git a/android/app/src/main/java/com/zulipmobile/MainActivity.kt b/android/app/src/main/java/com/zulipmobile/MainActivity.kt
@@ -58,12 +58,12 @@ open class MainActivity : ReactActivity() {
     /* Returns true just if we did handle the intent. */
     private fun maybeHandleIntent(intent: Intent?): Boolean {
         // We handle intents from "sharing" something to Zulip.
-        if (intent?.action == Intent.ACTION_SEND) {
-            handleSend(intent)
-            return true
+        if (intent != null) {
+            if ((intent.action == Intent.ACTION_SEND) or (intent.action == Intent.ACTION_SEND_MULTIPLE)) {
+                handleSend(intent)
+                return true
+            }
         }
-        // TODO also handle ACTION_SEND_MULTIPLE?
-        //   See: https://developer.android.com/training/sharing/receive#receiving-data-activity
 
         // For other intents, let RN handle it.  In particular this is
         // important for VIEW intents with zulip: URLs.
@@ -121,26 +121,35 @@ open class MainActivity : ReactActivity() {
         // For documentation of what fields to expect here, see:
         //   https://developer.android.com/reference/android/content/Intent#ACTION_SEND
         val params = Arguments.createMap()
-        when {
-            "text/plain" == intent.type -> {
-                val sharedText = intent.getStringExtra(Intent.EXTRA_TEXT)
-                params.putString("type", "text")
-                params.putString("sharedText", sharedText)
-            }
-            intent.type?.startsWith("image/") == true -> {
-                val url = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
-                    ?: throw ShareParamsParseException("Could not extract URL from Image Intent")
-                params.putString("type", "image")
-                params.putString("sharedImageUrl", url.toString())
-                params.putString("fileName", getFileName(url, this.contentResolver))
-            }
-            else -> {
-                val url = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
-                    ?: throw ShareParamsParseException("Could not extract URL from File Intent")
-                params.putString("type", "file")
-                params.putString("sharedFileUrl", url.toString())
-                params.putString("fileName", getFileName(url, this.contentResolver))
+
+        if ("text/plain" == intent.type) {
+            val sharedText = intent.getStringExtra(Intent.EXTRA_TEXT)
+            params.putBoolean("isText", true)
+            params.putString("sharedText", sharedText)
+        } else {
+            val content = Arguments.createArray();
+            val url = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
+            val urls = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
+            val cr = this.contentResolver
+
+            if (url != null) {
+                val singleContent = Arguments.createMap()
+                singleContent.putString("url", url.toString())
+                singleContent.putString("type", cr.getType(url))
+                singleContent.putString("fileName", getFileName(url, cr))
+                content.pushMap(singleContent)
+            } else if (urls != null) {
+                for (u in urls) {
+                    val singleContent = Arguments.createMap()
+                    singleContent.putString("url", u.toString())
+                    singleContent.putString("type", cr.getType(u))
+                    singleContent.putString("fileName", getFileName(u, cr))
+                    content.pushMap(singleContent)
+                }
             }
+
+            params.putBoolean("isText", false)
+            params.putArray("content", content)
         }
         return params
     }
diff --git a/src/sharing/ShareToPm.js b/src/sharing/ShareToPm.js
@@ -1,6 +1,6 @@
 /* @flow strict-local */
 import React from 'react';
-import { View, Image, ScrollView, Modal } from 'react-native';
+import { View, Image, ScrollView, Modal, FlatList } from 'react-native';
 import type { RouteProp } from '../react-navigation';
 import type { SharingNavigationProp } from './SharingScreen';
 import * as NavigationService from '../nav/NavigationService';
@@ -80,7 +80,7 @@ class ShareToPm extends React.Component<Props, State> {
     const { sharedData } = this.props.route.params;
     return {
       selectedRecipients: [],
-      message: sharedData.type === 'text' ? sharedData.sharedText : '',
+      message: sharedData.isText ? sharedData.sharedText : '',
       choosingRecipients: false,
       sending: false,
     };
@@ -135,7 +135,7 @@ class ShareToPm extends React.Component<Props, State> {
     const { message, selectedRecipients } = this.state;
     const { sharedData } = this.props.route.params;
 
-    if (sharedData.type === 'text') {
+    if (sharedData.isText) {
       return message !== '' && selectedRecipients.length > 0;
     }
 
@@ -155,6 +155,13 @@ class ShareToPm extends React.Component<Props, State> {
     return preview;
   };
 
+  renderItem = ({ item, index, separators }) =>
+    item.type.startsWith('image') ? (
+      <Image source={{ uri: item.url }} style={styles.imagePreview} />
+    ) : (
+      <></>
+    );
+
   render() {
     const { message, choosingRecipients, sending } = this.state;
 
@@ -167,17 +174,22 @@ class ShareToPm extends React.Component<Props, State> {
     }
 
     const { sharedData } = this.props.route.params;
-    let sharePreview = null;
-    if (sharedData.type === 'image') {
-      sharePreview = (
-        <Image source={{ uri: sharedData.sharedImageUrl }} style={styles.imagePreview} />
-      );
-    }
 
     return (
       <>
         <ScrollView style={styles.wrapper} keyboardShouldPersistTaps="always">
-          <View style={styles.container}>{sharePreview}</View>
+          <View style={styles.container}>
+            {sharedData.isText ? (
+              <></>
+            ) : (
+              <FlatList
+                data={sharedData.content}
+                renderItem={this.renderItem}
+                keyExtractor={i => i.url}
+                horizontal
+              />
+            )}
+          </View>
           <View style={styles.usersPreview}>{this.renderUsersPreview()}</View>
           <ZulipButton
             onPress={() => this.setState({ choosingRecipients: true })}
diff --git a/src/sharing/ShareToStream.js b/src/sharing/ShareToStream.js
@@ -1,6 +1,6 @@
 /* @flow strict-local */
 import React from 'react';
-import { View, Image, ScrollView } from 'react-native';
+import { View, Image, ScrollView, FlatList } from 'react-native';
 import type { SharingNavigationProp } from './SharingScreen';
 import type { RouteProp } from '../react-navigation';
 import * as NavigationService from '../nav/NavigationService';
@@ -149,13 +149,20 @@ class ShareToStream extends React.Component<Props, State> {
     const { stream, topic, message } = this.state;
     const { sharedData } = this.props.route.params;
 
-    if (sharedData.type !== 'text') {
+    if (!sharedData.isText) {
       return stream !== '' && topic !== '';
     }
 
     return stream !== '' && topic !== '' && message !== '';
   };
 
+  renderItem = ({ item, index, separators }) =>
+    item.type.startsWith('image') ? (
+      <Image source={{ uri: item.url }} style={styles.imagePreview} />
+    ) : (
+      <></>
+    );
+
   render() {
     const { sharedData } = this.props.route.params;
     const { stream, topic, message, isStreamFocused, isTopicFocused, sending } = this.state;
@@ -165,8 +172,15 @@ class ShareToStream extends React.Component<Props, State> {
       <>
         <ScrollView style={styles.wrapper} keyboardShouldPersistTaps="always" nestedScrollEnabled>
           <View style={styles.container}>
-            {sharedData.type === 'image' && (
-              <Image source={{ uri: sharedData.sharedImageUrl }} style={styles.imagePreview} />
+            {sharedData.isText ? (
+              <></>
+            ) : (
+              <FlatList
+                data={sharedData.content}
+                renderItem={this.renderItem}
+                keyExtractor={i => i.url}
+                horizontal
+              />
             )}
             <AnimatedScaleComponent visible={isStreamFocused}>
               <StreamAutocomplete filter={stream} onAutocomplete={this.handleStreamAutoComplete} />
diff --git a/src/sharing/send.js b/src/sharing/send.js
@@ -29,16 +29,16 @@ type SendPm = {|
 export const handleSend = async (data: SendStream | SendPm, auth: Auth, _: GetText) => {
   const sharedData = data.sharedData;
   let messageToSend = data.message;
+  if (!sharedData.isText) {
+    const { content } = sharedData;
+    for (let i = 0; i < content.length; i++) {
+      const response = await uploadFile(auth, content[i].url, content[i].fileName);
+      messageToSend += `\n[${content[i].fileName}](${response.uri})\n`;
+    }
+  }
 
   showToast(_('Sending Message...'));
 
-  if (sharedData.type === 'image' || sharedData.type === 'file') {
-    const url = sharedData.type === 'image' ? sharedData.sharedImageUrl : sharedData.sharedFileUrl;
-    const fileName = sharedData.fileName;
-    const response = await uploadFile(auth, url, fileName);
-    messageToSend += `\n[${fileName}](${response.uri})`;
-  }
-
   const messageData =
     data.type === 'pm'
       ? {
diff --git a/src/types.js b/src/types.js
@@ -338,24 +338,23 @@ export type PmConversationData = {|
   unread: number,
 |};
 
-export type SharedText = {|
-  type: 'text',
-  sharedText: string,
+export type Content = {|
+  url: string,
+  type: string,
+  fileName: string,
 |};
 
-export type SharedImage = {|
-  type: 'image',
-  sharedImageUrl: string,
-  fileName: string,
+export type SharedText = {|
+  isText: true,
+  sharedText: string,
 |};
 
-export type SharedFile = {|
-  type: 'file',
-  sharedFileUrl: string,
-  fileName: string,
+export type SharedContent = {|
+  isText: false,
+  content: Array<Content>,
 |};
 
 /**
  * The data we get when the user "shares" to Zulip from another app.
  */
-export type SharedData = SharedText | SharedImage | SharedFile;
+export type SharedData = SharedText | SharedContent;
