mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Click on failed item now shows detail view

Browse source 
Can restart from there. Abort button is not yet fully functional.
This commit is contained in:
Brion Vibber 2013-05-09 17:50:20 -07:00
parent 143fc308e9
commit cf86dc918c
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
View file

@ -120,6 +120,17 @@ public class ContributionsActivity
mediaDetails.showImage(i); mediaDetails.showImage(i);
} }
public void retryUpload(int i) {
allContributions.moveToPosition(i);
Contribution c = Contribution.fromCursor(allContributions);
if(c.getState() == Contribution.STATE_FAILED) {
uploadService.queue(UploadService.ACTION_UPLOAD_FILE, c);
Log.d("Commons", "Restarting for" + c.toContentValues().toString());
} else {
Log.d("Commons", "Skipping re-upload for non-failed " + c.toContentValues().toString());
}
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) { switch(item.getItemId()) {
@ -143,13 +154,10 @@ public class ContributionsActivity
public void onItemClick(AdapterView<?> adapterView, View view, int position, long item) { public void onItemClick(AdapterView<?> adapterView, View view, int position, long item) {
Cursor cursor = (Cursor)adapterView.getItemAtPosition(position); Cursor cursor = (Cursor)adapterView.getItemAtPosition(position);
Contribution c = Contribution.fromCursor(cursor); Contribution c = Contribution.fromCursor(cursor);
if(c.getState() == Contribution.STATE_FAILED) {
uploadService.queue(UploadService.ACTION_UPLOAD_FILE, c); Log.d("Commons", "Clicking for " + c.toContentValues());
Log.d("Commons", "Restarting for" + c.toContentValues().toString()); showDetail(position);
} else {
Log.d("Commons", "CLicking for " + c.toContentValues());
showDetail(position);
}
Log.d("Commons", "You clicked on:" + c.toContentValues().toString()); Log.d("Commons", "You clicked on:" + c.toContentValues().toString());
} }

12
commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
View file

@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.*; import android.view.*;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
@ -15,6 +16,8 @@ import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.ShareActionProvider; import com.actionbarsherlock.widget.ShareActionProvider;
import org.wikimedia.commons.*; import org.wikimedia.commons.*;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsActivity;
public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener { public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
private ViewPager pager; private ViewPager pager;
@ -129,12 +132,13 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
startActivity(viewIntent); startActivity(viewIntent);
return true; return true;
case R.id.menu_retry_current_image: case R.id.menu_retry_current_image:
// todo: close this activity and retry image // Is this... sane? :)
this.getSherlockActivity().finish(); ((ContributionsActivity)getSherlockActivity()).retryUpload(pager.getCurrentItem());
getSherlockActivity().getSupportFragmentManager().popBackStack();
return true; return true;
case R.id.menu_abort_current_image: case R.id.menu_abort_current_image:
// todo: close this activity and delete image // todo: delete image
this.getSherlockActivity().finish(); getSherlockActivity().getSupportFragmentManager().popBackStack();
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);