|
|
|
@ -525,13 +525,16 @@ public class UploadActivity extends AppCompatActivity {
|
|
|
|
|
public void onActivityResult(int requestCode, int resultCode,Intent returnIntent) {
|
|
|
|
|
if(resultCode == RESULT_OK){
|
|
|
|
|
//retrieve uri from the request image activity and prepare
|
|
|
|
|
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
|
|
|
|
|
ClipData clip = null;
|
|
|
|
|
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)
|
|
|
|
|
clip = returnIntent.getClipData();
|
|
|
|
|
|
|
|
|
|
if(clip == null) {
|
|
|
|
|
Uri imageUri = returnIntent.getData();
|
|
|
|
|
uris.add(imageUri);
|
|
|
|
|
updateSpanCount();
|
|
|
|
|
adapter.addUri(this,imageUri);
|
|
|
|
|
} else {
|
|
|
|
|
ClipData clip = returnIntent.getClipData();
|
|
|
|
|
for(int i = 0; clip != null && i < clip.getItemCount(); i++) {
|
|
|
|
|
Uri imageUri = clip.getItemAt(i).getUri();
|
|
|
|
|
uris.add(imageUri);
|
|
|
|
|