Fix issue #246
This commit is contained in:
parent
7d56e1c1fa
commit
b69780c8cb
|
@ -125,6 +125,7 @@ import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.GregorianCalendar;
|
import java.util.GregorianCalendar;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -1301,17 +1302,27 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
final ImageView imageView = new ImageView(getApplicationContext());
|
final ImageView imageView = new ImageView(getApplicationContext());
|
||||||
imageView.setId(Integer.parseInt(attachment.getId()));
|
imageView.setId(Integer.parseInt(attachment.getId()));
|
||||||
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA){
|
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA){
|
||||||
Uri uri = filesMap.get(attachment.getUrl());
|
if( uploadInfo.getSuccessfullyUploadedFiles() != null && uploadInfo.getSuccessfullyUploadedFiles().size() > 0) {
|
||||||
Glide.with(imageView.getContext())
|
|
||||||
.asBitmap()
|
Iterator it = filesMap.entrySet().iterator();
|
||||||
.load(uri)
|
Uri fileName = null;
|
||||||
.error(Glide.with(imageView).asBitmap().load(R.drawable.ic_audio_wave))
|
while (it.hasNext()) {
|
||||||
.into(new SimpleTarget<Bitmap>() {
|
Map.Entry pair = (Map.Entry)it.next();
|
||||||
@Override
|
fileName = (Uri) pair.getValue();
|
||||||
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
it.remove();
|
||||||
imageView.setImageBitmap(resource);
|
}
|
||||||
}
|
if (fileName != null ) {
|
||||||
});
|
Glide.with(imageView.getContext())
|
||||||
|
.asBitmap()
|
||||||
|
.load(fileName)
|
||||||
|
.into(new SimpleTarget<Bitmap>() {
|
||||||
|
@Override
|
||||||
|
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
||||||
|
imageView.setImageBitmap(resource);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
String finalUrl = url;
|
String finalUrl = url;
|
||||||
|
@ -2804,6 +2815,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
try {
|
try {
|
||||||
tempInput = getContentResolver().openInputStream(inUri);
|
tempInput = getContentResolver().openInputStream(inUri);
|
||||||
File file = File.createTempFile("randomTemp1", suffix, getCacheDir());
|
File file = File.createTempFile("randomTemp1", suffix, getCacheDir());
|
||||||
|
filesMap.put(file.getAbsolutePath(), inUri);
|
||||||
tempOut = new FileOutputStream(file.getAbsoluteFile());
|
tempOut = new FileOutputStream(file.getAbsoluteFile());
|
||||||
byte[] buff = new byte[1024];
|
byte[] buff = new byte[1024];
|
||||||
int read;
|
int read;
|
||||||
|
@ -2847,9 +2859,12 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
.setClearOnActionForAllStatuses(true);
|
.setClearOnActionForAllStatuses(true);
|
||||||
uploadConfig.getProgress().message = getString(R.string.uploading);
|
uploadConfig.getProgress().message = getString(R.string.uploading);
|
||||||
uploadConfig.getCompleted().autoClear = true;
|
uploadConfig.getCompleted().autoClear = true;
|
||||||
MultipartUploadRequest request = new MultipartUploadRequest(context,uploadId, url)
|
MultipartUploadRequest request = new MultipartUploadRequest(context,uploadId, url);
|
||||||
.addHeader("Authorization", "Bearer " + token)
|
if (token != null && !token.startsWith("Basic "))
|
||||||
.setNotificationConfig(uploadConfig);
|
request.addHeader("Authorization", "Bearer " + token);
|
||||||
|
else if( token != null && token.startsWith("Basic "))
|
||||||
|
request.addHeader("Authorization", token);
|
||||||
|
request.setNotificationConfig(uploadConfig);
|
||||||
if( MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
|
if( MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
|
||||||
request.addFileToUpload(uri.toString().replace("file://",""), "file");
|
request.addFileToUpload(uri.toString().replace("file://",""), "file");
|
||||||
}else {
|
}else {
|
||||||
|
|
Loading…
Reference in New Issue