Skip to content

Uploads storage manager sync #5488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashpieboop wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −1
Open

Uploads storage manager sync #5488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/nextcloud/client/di/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
import com.nextcloud.client.notifications.AppNotificationManagerImpl;
import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.client.utils.Throttler;
import com.owncloud.android.providers.UsersAndGroupsSearchConfig;
import com.owncloud.android.authentication.PassCodeManager;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.SyncedFolderProvider;
import com.owncloud.android.datamodel.UploadsStorageManager;
import com.owncloud.android.providers.UsersAndGroupsSearchConfig;
import com.owncloud.android.ui.activities.data.activities.ActivitiesRepository;
import com.owncloud.android.ui.activities.data.activities.ActivitiesServiceApi;
import com.owncloud.android.ui.activities.data.activities.ActivitiesServiceApiImpl;
Expand Down Expand Up @@ -134,6 +134,7 @@ FilesRepository filesRepository(UserAccountManager accountManager, ClientFactory
}

@Provides
@Singleton
UploadsStorageManager uploadsStorageManager(CurrentAccountProvider currentAccountProvider,
Context context) {
return new UploadsStorageManager(currentAccountProvider, context.getContentResolver());
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,12 @@ public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationRe
}
}

@Override
protected void onDestroy() {
super.onDestroy();
uploadListAdapter.onDestroy();
}

/**
* Once the file upload has changed its status -> update uploads list view
*/
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.text.format.DateUtils;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -61,6 +63,7 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Observer;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
Expand Down Expand Up @@ -121,6 +124,8 @@ public static List<GroupConfig> getConfigs() {
private final List<GroupConfig> uploadGroupConfigs = GroupConfig.getConfigs();

private final FileUploadHelper uploadHelper = FileUploadHelper.Companion.instance();
private Observer uploadDbObserver;
private final Handler mainHandler;

public UploadListAdapter(final FileActivity fileActivity,
final UploadsStorageManager uploadsStorageManager,
Expand All @@ -146,6 +151,10 @@ public UploadListAdapter(final FileActivity fileActivity,
shouldShowHeadersForEmptySections(false);
initUploadGroups();
showUser = accountManager.getAccounts().length > 1;

mainHandler = new Handler(Looper.getMainLooper());
uploadDbObserver = (o, arg) -> mainHandler.post(this::loadUploadItemsFromDb);
uploadsStorageManager.addObserver(uploadDbObserver);
}

private void initUploadGroups() {
Expand Down Expand Up @@ -1086,4 +1095,11 @@ public void cancelOldErrorNotification(OCUpload upload) {

mNotificationManager.cancel((int) upload.getUploadId());
}

/**
* Must be called when parent view is destroyed
*/
public void onDestroy() {
uploadsStorageManager.deleteObserver(this.uploadDbObserver);
}
}
Loading