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

Modified UploadController

Browse source
This commit is contained in:
misaochan 2015-10-29 21:50:29 +13:00
parent a519b82761
commit d0e9b8ae9a
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java
View file

@ -15,8 +15,6 @@ import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.HandlerService; import fr.free.nrw.commons.HandlerService;
import fr.free.nrw.commons.Prefs; import fr.free.nrw.commons.Prefs;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.campaigns.Campaign;
import fr.free.nrw.commons.campaigns.CampaignContribution;
import java.io.IOException; import java.io.IOException;
import java.util.Date; import java.util.Date;
@ -25,7 +23,6 @@ public class UploadController {
private UploadService uploadService; private UploadService uploadService;
private final Activity activity; private final Activity activity;
private Campaign campaign;
final CommonsApplication app; final CommonsApplication app;
public interface ContributionUploadProgress { public interface ContributionUploadProgress {
@ -37,11 +34,6 @@ public class UploadController {
app = (CommonsApplication)activity.getApplicationContext(); app = (CommonsApplication)activity.getApplicationContext();
} }
public UploadController(Activity activity, Campaign campaign) {
this(activity);
this.campaign = campaign;
}
private boolean isUploadServiceConnected; private boolean isUploadServiceConnected;
private ServiceConnection uploadServiceConnection = new ServiceConnection() { private ServiceConnection uploadServiceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName componentName, IBinder binder) { public void onServiceConnected(ComponentName componentName, IBinder binder) {
@ -81,11 +73,9 @@ public class UploadController {
title += "." + extension; title += "." + extension;
} }
if(campaign == null) {
contribution = new Contribution(mediaUri, null, title, description, -1, null, null, app.getCurrentAccount().name, CommonsApplication.DEFAULT_EDIT_SUMMARY); contribution = new Contribution(mediaUri, null, title, description, -1, null, null, app.getCurrentAccount().name, CommonsApplication.DEFAULT_EDIT_SUMMARY);
} else {
contribution = new CampaignContribution(mediaUri, null, title, description, -1, null, null, app.getCurrentAccount().name, CommonsApplication.DEFAULT_EDIT_SUMMARY, campaign);
}
contribution.setTag("mimeType", mimeType); contribution.setTag("mimeType", mimeType);
contribution.setSource(source); contribution.setSource(source);