mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Add 'UP' support to Multiple uploads
This commit is contained in:
parent
d18533eb87
commit
20bd488fa4
1 changed files with 18 additions and 1 deletions
|
|
@ -9,6 +9,7 @@ import android.net.Uri;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
|
|
@ -29,7 +30,8 @@ import java.util.concurrent.ExecutionException;
|
||||||
public class MultipleShareActivity
|
public class MultipleShareActivity
|
||||||
extends AuthenticatedActivity
|
extends AuthenticatedActivity
|
||||||
implements MediaDetailPagerFragment.MediaDetailProvider,
|
implements MediaDetailPagerFragment.MediaDetailProvider,
|
||||||
AdapterView.OnItemClickListener {
|
AdapterView.OnItemClickListener,
|
||||||
|
FragmentManager.OnBackStackChangedListener {
|
||||||
private CommonsApplication app;
|
private CommonsApplication app;
|
||||||
private ArrayList<Contribution> photosList = null;
|
private ArrayList<Contribution> photosList = null;
|
||||||
|
|
||||||
|
|
@ -148,6 +150,11 @@ public class MultipleShareActivity
|
||||||
StartMultipleUploadTask startUploads = new StartMultipleUploadTask();
|
StartMultipleUploadTask startUploads = new StartMultipleUploadTask();
|
||||||
Utils.executeAsyncTask(startUploads);
|
Utils.executeAsyncTask(startUploads);
|
||||||
return true;
|
return true;
|
||||||
|
case android.R.id.home:
|
||||||
|
if(mediaDetails.isVisible()) {
|
||||||
|
getSupportFragmentManager().popBackStack();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
@ -162,6 +169,8 @@ public class MultipleShareActivity
|
||||||
if(savedInstanceState != null) {
|
if(savedInstanceState != null) {
|
||||||
photosList = savedInstanceState.getParcelableArrayList("uploadsList");
|
photosList = savedInstanceState.getParcelableArrayList("uploadsList");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getSupportFragmentManager().addOnBackStackChangedListener(this);
|
||||||
requestAuthToken();
|
requestAuthToken();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -240,4 +249,12 @@ public class MultipleShareActivity
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void onBackStackChanged() {
|
||||||
|
if(mediaDetails != null && mediaDetails.isVisible()) {
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
} else {
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue