commit 70dd5aa04358c30300e5d19c4caf8af91494f33b
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Fri Dec 04 15:18:47 2020 -0500
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Fri Dec 04 18:17:15 2020 -0500
tree 93d4b17a3f4d8fdd42ca6417ff7f1fdf2c7a6397
parent 9bfb269a1b5621f3ebbb45d3da2b3be05ed36a36

conversation: don't ignore result if null data

Change-Id: Ie46e7b7d83008f644977e3fcac01e3267d9671f8

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 22f2a0f..de0b4cc 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -583,10 +583,7 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
         Log.w(TAG, "onActivityResult: " + requestCode + " " + resultCode + " " + resultData);
-        if (resultData == null) {
-            return;
-        }
-        android.net.Uri uri = resultData.getData();
+        android.net.Uri uri = resultData == null ? null : resultData.getData();
         if (requestCode == REQUEST_CODE_FILE_PICKER) {
             if (resultCode == RESULT_OK && uri != null) {
                 startFileSend(AndroidFileUtils.getCacheFile(requireContext(), uri)