mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
fixes - #1984 -Upload count does not get updated right away post successful upload
->implements the Callback method to update total number of media uploaded
This commit is contained in:
parent
3ad16d120f
commit
8384ad03dc
2 changed files with 23 additions and 1 deletions
|
|
@ -38,6 +38,7 @@ import fr.free.nrw.commons.auth.SessionManager;
|
|||
import fr.free.nrw.commons.notification.Notification;
|
||||
import fr.free.nrw.commons.notification.NotificationController;
|
||||
import fr.free.nrw.commons.theme.BaseActivity;
|
||||
import fr.free.nrw.commons.upload.UploadService.ServiceCallback;
|
||||
import io.reactivex.disposables.Disposable;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -84,7 +85,7 @@ public class ContributionsFragment
|
|||
OnBackStackChangedListener,
|
||||
LocationUpdateListener,
|
||||
MediaDetailProvider,
|
||||
ICampaignsView, ContributionsContract.View, Callback {
|
||||
ICampaignsView, ContributionsContract.View, Callback , ServiceCallback {
|
||||
@Inject @Named("default_preferences") JsonKvStore store;
|
||||
@Inject NearbyController nearbyController;
|
||||
@Inject OkHttpJsonApiClient okHttpJsonApiClient;
|
||||
|
|
@ -135,6 +136,7 @@ public class ContributionsFragment
|
|||
public void onServiceConnected(ComponentName componentName, IBinder binder) {
|
||||
uploadService = (UploadService) ((UploadService.UploadServiceLocalBinder) binder)
|
||||
.getService();
|
||||
uploadService.setServiceCallback(ContributionsFragment.this);
|
||||
isUploadServiceConnected = true;
|
||||
}
|
||||
|
||||
|
|
@ -520,6 +522,7 @@ public class ContributionsFragment
|
|||
|
||||
if (isUploadServiceConnected) {
|
||||
if (getActivity() != null) {
|
||||
uploadService.setServiceCallback(null);
|
||||
getActivity().unbindService(uploadServiceConnection);
|
||||
isUploadServiceConnected = false;
|
||||
}
|
||||
|
|
@ -666,5 +669,10 @@ public class ContributionsFragment
|
|||
public MediaDetailPagerFragment getMediaDetailPagerFragment() {
|
||||
return mediaDetailPagerFragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateUploadCount() {
|
||||
setUploadCount();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ public class UploadService extends CommonsDaggerService {
|
|||
private NotificationCompat.Builder curNotification;
|
||||
private int toUpload;
|
||||
private CompositeDisposable compositeDisposable;
|
||||
private ServiceCallback serviceCallback;
|
||||
|
||||
/**
|
||||
* The filePath names of unfinished uploads, used to prevent overwriting
|
||||
|
|
@ -395,6 +396,10 @@ public class UploadService extends CommonsDaggerService {
|
|||
}
|
||||
}
|
||||
saveCompletedContribution(contribution, uploadResult);
|
||||
if(serviceCallback!=null) {
|
||||
//this function update the tatol number media Uploaded or contributions
|
||||
serviceCallback.updateUploadCount();
|
||||
}
|
||||
}
|
||||
|
||||
private void saveCompletedContribution(Contribution contribution, UploadResult uploadResult) {
|
||||
|
|
@ -471,4 +476,13 @@ public class UploadService extends CommonsDaggerService {
|
|||
}
|
||||
return sequenceFileName;
|
||||
}
|
||||
|
||||
public interface ServiceCallback{
|
||||
void updateUploadCount() ;
|
||||
}
|
||||
|
||||
public void setServiceCallback(ServiceCallback serviceCallback) {
|
||||
this.serviceCallback = serviceCallback;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue