vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 12:22:08 +01:00
Code Issues Releases Wiki Activity

Fixed a bug where on Lolipop+ one could only append one image to a post

Browse source
This commit is contained in:
vanitasvitae 2016-09-20 20:41:25 +02:00
parent 4a135e50d6
commit 2996c63981
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -430,9 +430,7 @@ public class MainActivity extends AppCompatActivity
} }
} }
AppLog.v(this, "onOpenFileChooser"); AppLog.v(MainActivity.this, "onOpenFileChooser");
if (imageUploadFilePathCallbackNew != null)
imageUploadFilePathCallbackNew.onReceiveValue(null);
imageUploadFilePathCallbackNew = filePathCallback; imageUploadFilePathCallbackNew = filePathCallback;
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
@ -623,6 +621,8 @@ public class MainActivity extends AppCompatActivity
if (imageUploadFilePathCallbackNew == null || resultCode != Activity.RESULT_OK) { if (imageUploadFilePathCallbackNew == null || resultCode != Activity.RESULT_OK) {
AppLog.e(this, "Callback is null: " + (imageUploadFilePathCallbackNew == null) AppLog.e(this, "Callback is null: " + (imageUploadFilePathCallbackNew == null)
+ " resultCode: " + resultCode); + " resultCode: " + resultCode);
if(imageUploadFilePathCallbackNew != null)
imageUploadFilePathCallbackNew.onReceiveValue(new Uri[]{});
return; return;
} }
Uri[] results = null; Uri[] results = null;
@ -651,6 +651,8 @@ public class MainActivity extends AppCompatActivity
if (imageUploadFilePathCallbackOld == null || resultCode != Activity.RESULT_OK) { if (imageUploadFilePathCallbackOld == null || resultCode != Activity.RESULT_OK) {
AppLog.e(this, "Callback is null: " + (imageUploadFilePathCallbackOld == null) AppLog.e(this, "Callback is null: " + (imageUploadFilePathCallbackOld == null)
+ " resultCode: " + resultCode); + " resultCode: " + resultCode);
if(imageUploadFilePathCallbackOld != null)
imageUploadFilePathCallbackOld.onReceiveValue(null);
return; return;
} }
Uri results = null; Uri results = null;