added support for Andoird 8/9 for sharing text/html

JochenHeizmann · Mar 30, 2019 · 331e244 · 331e244
1 parent ce53001
commit 331e244
Showing 1 changed file with 30 additions and 1 deletion.
diff --git a/src/android/cc/fovea/openwith/Serializer.java b/src/android/cc/fovea/openwith/Serializer.java
@@ -81,7 +81,15 @@ public static JSONArray itemsFromClipData(
             final int clipItemCount = clipData.getItemCount();
             JSONObject[] items = new JSONObject[clipItemCount];
             for (int i = 0; i < clipItemCount; i++) {
-                items[i] = toJSONObject(contentResolver, clipData.getItemAt(i).getUri());
+                if (clipData.getItemAt(i).getUri() != null) {
+                    items[i] = toJSONObject(contentResolver, clipData.getItemAt(i).getUri());
+                } else if (clipData.getItemAt(i).getText() != null) {
+                    items[i] = toJSONObject(contentResolver, clipData.getItemAt(i).getText().toString());
+                } else if (clipData.getItemAt(i).getHtmlText() != null) {
+                    items[i] = toJSONObject(contentResolver, clipData.getItemAt(i).getHtmlText());
+                } else {
+                    items[i] = toJSONObject(contentResolver, clipData.getItemAt(i).toString());
+                }
             }
             return new JSONArray(items);
         }
@@ -153,6 +161,27 @@ public static JSONObject toJSONObject(
         return json;
     }
 
+    /** Convert an String to JSON object.
+     *
+     * Object will include:
+     *    "type" of data;
+     *    "text" itself;
+     *    "path" to the file, if applicable.
+     *    "data" for the file.
+     */
+    public static JSONObject toJSONObject(
+            final ContentResolver contentResolver,
+            final String text)
+            throws JSONException {
+        if (text == null) {
+            return null;
+        }
+        final JSONObject json = new JSONObject();
+        json.put("type", "text/plain");
+        json.put("text", text);
+        return json;
+    }
+
     /** Return data contained at a given Uri as Base64. Defaults to null. */
     public static String getDataFromURI(
             final ContentResolver contentResolver,