Przeglądaj źródła

Checking Priviledges Error failed uploads

masensio 9 lat temu
rodzic
commit
2f231561af

+ 1 - 0
res/values/strings.xml

@@ -126,6 +126,7 @@
     <string name="uploads_view_upload_status_failed_credentials_error">Credentials error</string>
     <string name="uploads_view_upload_status_failed_folder_error">Folder error</string>
     <string name="uploads_view_upload_status_failed_file_error">File error</string>
+    <string name="uploads_view_upload_status_failed_priviledges_error">Priviledges error</string>
     <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
     <string name="downloader_download_succeeded_ticker">Download succeeded</string>

+ 1 - 1
src/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -503,7 +503,7 @@ public class UploadsStorageManager extends Observable {
                 },
                 null
         );
-        updateUploadInternal(c, UploadStatus.UPLOAD_LATER, null);
+        updateUploadInternal(c, UploadStatus.UPLOAD_LATER, UploadResult.UNKNOWN);
     }
 
 }

+ 4 - 3
src/com/owncloud/android/db/UploadResult.java

@@ -86,15 +86,16 @@ public enum UploadResult {
                 return CONFLICT_ERROR;
             case LOCAL_STORAGE_NOT_COPIED:
                 return FILE_ERROR;
-//            case UNAUTHORIZED:
-//                return PRIVILEDGES_ERROR;
+            case FORBIDDEN:
+                return PRIVILEDGES_ERROR;
             case CANCELLED:
                 return CANCELLED;
             case UNKNOWN_ERROR:
                 if (result.getException() instanceof java.io.FileNotFoundException)
                     return FILE_ERROR;
                 return UNKNOWN;
+            default:
+                return UNKNOWN;
         }
-        return null;
     }
 }

+ 4 - 0
src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -239,6 +239,10 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                                 status = mParentActivity.getString(
                                         R.string.uploads_view_upload_status_failed_file_error);
                                 break;
+                            case PRIVILEDGES_ERROR:
+                                status = mParentActivity.getString(
+                                        R.string.uploads_view_upload_status_failed_priviledges_error);
+                                break;
                             default:
                                 status = "Upload failed: " + upload.getLastResult().toString();
                                 break;