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

Merge pull request #12212 from nextcloud/fix/quota_exceeded_message_uploadlist

Browse source 
Use custom quota exceeded error message in UploadList
This commit is contained in:
Andy Scherzinger 2023-12-06 15:46:23 +01:00 committed by GitHub
commit 6acd893ee1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/owncloud/android/db/UploadResult.java
View file

@ -44,7 +44,8 @@ public enum UploadResult {
OLD_ANDROID_API(18),
SYNC_CONFLICT(19),
CANNOT_CREATE_FILE(20),
LOCAL_STORAGE_NOT_COPIED(21);
LOCAL_STORAGE_NOT_COPIED(21),
QUOTA_EXCEEDED(22);
private final int value;
@ -104,6 +105,8 @@ public enum UploadResult {
return CANNOT_CREATE_FILE;
case 21:
return LOCAL_STORAGE_NOT_COPIED;
case 22:
return QUOTA_EXCEEDED;
}
return UNKNOWN;
}
@ -162,6 +165,8 @@ public enum UploadResult {
return VIRUS_DETECTED;
case CANNOT_CREATE_FILE:
return CANNOT_CREATE_FILE;
case QUOTA_EXCEEDED:
return QUOTA_EXCEEDED;
default:
return UNKNOWN;
}

3
app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
View file

@ -711,6 +711,9 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
case LOCAL_STORAGE_NOT_COPIED:
status = parentActivity.getString(R.string.upload_local_storage_not_copied);
break;
case QUOTA_EXCEEDED:
status = parentActivity.getString(R.string.upload_quota_exceeded);
break;
default:
status = parentActivity.getString(R.string.upload_unknown_error);
break;

2
app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
View file

@ -467,7 +467,7 @@ public class ExtendedListFragment extends Fragment implements
private void scrollToPosition(int position) {
LinearLayoutManager linearLayoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
if (mRecyclerView != null) {
if (linearLayoutManager != null) {
int visibleItemCount = linearLayoutManager.findLastCompletelyVisibleItemPosition() -
linearLayoutManager.findFirstCompletelyVisibleItemPosition();
linearLayoutManager.scrollToPositionWithOffset(position, (visibleItemCount / 2) * mHeightCell);