|
|
|
@ -221,7 +221,8 @@ public class UploadActivity extends AppCompatActivity {
|
|
|
|
|
public void run() {
|
|
|
|
|
if(progressDialog != null) {
|
|
|
|
|
progressDialog.setMessage(getString(R.string.uploading_files)+" "+fileNo+"/"+nbFiles);
|
|
|
|
|
progressDialog.setProgress(progress * 100 / length);
|
|
|
|
|
if(length != 0)
|
|
|
|
|
progressDialog.setProgress(progress * 100 / length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
@ -531,7 +532,7 @@ public class UploadActivity extends AppCompatActivity {
|
|
|
|
|
adapter.addUri(this,imageUri);
|
|
|
|
|
} else {
|
|
|
|
|
ClipData clip = returnIntent.getClipData();
|
|
|
|
|
for(int i = 0; i < clip.getItemCount(); i++) {
|
|
|
|
|
for(int i = 0; clip != null && i < clip.getItemCount(); i++) {
|
|
|
|
|
Uri imageUri = clip.getItemAt(i).getUri();
|
|
|
|
|
uris.add(imageUri);
|
|
|
|
|
updateSpanCount();
|
|
|
|
|