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

Small fix when sharing several images.

This commit is contained in:
tom79 2017-08-22 11:59:25 +02:00
parent c8a3e9a3f1
commit cc8a2870d6
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
View File

@ -33,6 +33,7 @@ import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.support.design.widget.NavigationView;
@ -503,7 +504,7 @@ public class MainActivity extends AppCompatActivity
Bundle b = new Bundle();
b.putParcelable("sharedUri", imageUri);
b.putBoolean("singleUri", true);
b.putInt("uriNumber", 1);
intentToot.putExtras(b);
startActivity(intentToot);
}
@ -512,14 +513,12 @@ public class MainActivity extends AppCompatActivity
if (type.startsWith("image/")) {
ArrayList<Uri> imageList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
if (imageList != null) {
Intent intentToot = new Intent(getApplicationContext(), TootActivity.class);
Bundle b = new Bundle();
b.putParcelableArrayList("sharedUri", imageList);
b.putBoolean("singleUri", false);
b.putInt("uriNumber", imageList.size());
intentToot.putExtras(b);
startActivity(intentToot);
}

36
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -236,9 +236,8 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
tootReply = b.getParcelable("tootReply");
sharedContent = b.getString("sharedContent", null);
sharedSubject = b.getString("sharedSubject", null);
// ACTION_SEND route
if (b.getBoolean("singleUri")) {
if (b.getInt("uriNumber", 0) == 1) {
Uri fileUri = b.getParcelable("sharedUri");
@ -248,14 +247,13 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
}
}
// ACTION_SEND_MULTIPLE route
else {
else if( b.getInt("uriNumber", 0) > 1) {
ArrayList<Uri> fileUri = b.getParcelableArrayList("sharedUri");
if (fileUri != null) {
sharedUri.addAll(fileUri);
}
}
restored = b.getLong("restored", -1);
}
if( restored != -1 ){
@ -544,24 +542,24 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
The first loads, the second (SEND_MULTIPLE) fails.
*/
Uri fileUri = uri.get(0);
for(Uri fileUri: uri) {
if (fileUri != null) {
picture_scrollview.setVisibility(View.VISIBLE);
if (fileUri != null) {
picture_scrollview.setVisibility(View.VISIBLE);
try {
InputStream inputStream = getContentResolver().openInputStream(fileUri);
loading_picture.setVisibility(View.VISIBLE);
toot_picture.setEnabled(false);
new UploadActionAsyncTask(getApplicationContext(), inputStream, TootActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} catch (FileNotFoundException e) {
try {
InputStream inputStream = getContentResolver().openInputStream(fileUri);
loading_picture.setVisibility(View.VISIBLE);
toot_picture.setEnabled(false);
new UploadActionAsyncTask(getApplicationContext(), inputStream, TootActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} catch (FileNotFoundException e) {
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
loading_picture.setVisibility(View.GONE);
toot_picture.setEnabled(true);
e.printStackTrace();
}
} else {
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
loading_picture.setVisibility(View.GONE);
toot_picture.setEnabled(true);
e.printStackTrace();
}
} else {
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
}
}
}