Merge branch 'develop' into feature/fresco

app/src/main/java/chat/rocket/android/api/FileUploadingHelper.java

@@ -33,12 +33,12 @@ public class FileUploadingHelper extends MethodCallHelper {
         .onSuccessTask(CONVERT_TO_JSON_OBJECT);
   }
 
-  public Task<JSONObject> sendFileMessage(String roomId, String storageType, JSONObject fileObj) {
+  public Task<Void> sendFileMessage(String roomId, String storageType, JSONObject fileObj) {
     return call("sendFileMessage", TIMEOUT_MS, () -> new JSONArray()
         .put(roomId)
         .put(TextUtils.isEmpty(storageType) ? JSONObject.NULL : storageType)
         .put(fileObj))
-        .onSuccessTask(CONVERT_TO_JSON_OBJECT);
+        .onSuccessTask(task -> Task.forResult(null));
   }
 
   public Task<JSONObject> ufsCreate(String filename, long filesize, String mimeType, String store,

app/src/main/java/chat/rocket/android/layouthelper/extra_action/upload/AudioUploadActionItem.java

 package chat.rocket.android.layouthelper.extra_action.upload;
 
 import android.content.Intent;
+import android.provider.MediaStore;
 
 import chat.rocket.android.R;
 
@@ -16,7 +17,13 @@ public class AudioUploadActionItem extends AbstractUploadActionItem {
     Intent intent = new Intent();
     intent.setType("audio/*");
     intent.setAction(Intent.ACTION_GET_CONTENT);
-    return Intent.createChooser(intent, "Select Audio to Upload");
+
+    Intent recordSoundIntent = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
+
+    Intent chooserIntent = Intent.createChooser(intent, "Select Audio to Upload");
+    chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { recordSoundIntent });
+
+    return chooserIntent;
   }
 
   @Override

app/src/main/java/chat/rocket/android/layouthelper/extra_action/upload/VideoUploadActionItem.java

 package chat.rocket.android.layouthelper.extra_action.upload;
 
 import android.content.Intent;
+import android.provider.MediaStore;
 
 import chat.rocket.android.R;
 
@@ -16,7 +17,14 @@ public class VideoUploadActionItem extends AbstractUploadActionItem {
     Intent intent = new Intent();
     intent.setType("video/*");
     intent.setAction(Intent.ACTION_GET_CONTENT);
-    return Intent.createChooser(intent, "Select Video to Upload");
+
+    Intent recordVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+    recordVideoIntent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 0); //low quality.
+
+    Intent chooserIntent = Intent.createChooser(intent, "Select Video to Upload");
+    chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { recordVideoIntent });
+
+    return chooserIntent;
   }
 
   @Override