|
@ -535,11 +535,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
|
535
|
535
|
try {
|
536
|
536
|
List<Uri> uriList = Matisse.obtainResult(data);
|
537
|
537
|
int i = 0;
|
538
|
|
<<<<<<< HEAD
|
539
|
538
|
for (Uri uri : uriList) {
|
540
|
|
=======
|
541
|
|
for (Uri uri: uriList) {
|
542
|
|
>>>>>>> 6efbc9d6e98858790040bd79841a2e24ccf64848
|
543
|
539
|
i++;
|
544
|
540
|
Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
|
545
|
541
|
File file = FileUtils.from(PublishPicTopicActivity.this, uri);
|