Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a crash when sharing image

This commit is contained in:
tom79 2019-07-24 15:36:43 +02:00
parent cbf2855e01
commit 5a4e98837c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -1247,6 +1247,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
private void prepareUpload(Activity activity, android.net.Uri uri,String filename, UploadServiceSingleBroadcastReceiver uploadReceiver){
if( uploadReceiver == null){
uploadReceiver = new UploadServiceSingleBroadcastReceiver(TootActivity.this);
uploadReceiver.register(this);
}
new asyncPicture(activity, uri, filename, uploadReceiver).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@ -1303,6 +1307,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
filename = Helper.getFileName(this.activityWeakReference.get(), uriFile);
}
filesMap.put(filename, uriFile);
upload(activityWeakReference.get(), uriFile, filename, uploadReceiver);
}
}
@ -1311,7 +1316,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
static private void upload(Activity activity, Uri inUri, String fname, UploadServiceSingleBroadcastReceiver uploadReceiver){
String uploadId = UUID.randomUUID().toString();
uploadReceiver.setUploadID(uploadId);
if( uploadReceiver != null) {
uploadReceiver.setUploadID(uploadId);
}
Uri uri;
InputStream tempInput = null;
FileOutputStream tempOut = null;