Просмотр исходного кода

Merge pull request #12212 from nextcloud/fix/quota_exceeded_message_uploadlist

Use custom quota exceeded error message in UploadList
Andy Scherzinger 1 год назад
Родитель
Сommit
6acd893ee1

+ 6 - 1
app/src/main/java/com/owncloud/android/db/UploadResult.java

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

+ 3 - 0
app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

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

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

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