mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8639 from nextcloud/shareType

Browse source 
Add new ShareType: GUEST, FEDERATED_GROUP, DECK, DECK_USER
This commit is contained in:
Tobias Kaminsky 2021-07-02 09:08:11 +02:00 committed by GitHub
commit 33157b5e66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -1373,7 +1373,7 @@ public class FileDataStorageManager {
}
// TODO shares null?
public void saveShares(Collection<OCShare> shares) {
public void saveShares(List<OCShare> shares) {
cleanShares();
ArrayList<ContentProviderOperation> operations = new ArrayList<>(shares.size());

3
src/main/java/com/owncloud/android/providers/FileContentProvider.java
View file

@ -403,8 +403,11 @@ public class FileContentProvider extends ContentProvider {
case GROUP:
case EMAIL:
case FEDERATED:
case FEDERATED_GROUP:
case ROOM:
case CIRCLE:
case DECK:
case GUEST:
fileValues.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, 1);
break;

15
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -1555,12 +1555,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
storageManager = mContainerActivity.getStorageManager();
}
if (remoteOperationResult.isSuccess() && remoteOperationResult.getData() != null
if (remoteOperationResult.isSuccess() && remoteOperationResult.getResultData() != null
&& !isCancelled() && searchFragment) {
if (remoteOperationResult.getData() == null || remoteOperationResult.getData().size() == 0) {
if (remoteOperationResult.getResultData() == null || ((List) remoteOperationResult.getResultData()).isEmpty()) {
setEmptyView(event);
} else {
mAdapter.setData(remoteOperationResult.getData(),
mAdapter.setData(((RemoteOperationResult<List>) remoteOperationResult).getResultData(),
currentSearchType,
storageManager,
mFile,
@ -1570,12 +1570,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
final ToolbarActivity fileDisplayActivity = (ToolbarActivity) getActivity();
if (fileDisplayActivity != null) {
fileDisplayActivity.runOnUiThread(new Runnable() {
@Override
public void run() {
if (fileDisplayActivity != null) {
setLoading(false);
}
fileDisplayActivity.runOnUiThread(() -> {
if (fileDisplayActivity != null) {
setLoading(false);
}
});
}