Luke Owncloud 10 年之前
父节点
当前提交
1922752824

+ 2 - 2
src/com/owncloud/android/files/services/FileUploadService.java

@@ -482,7 +482,7 @@ public class FileUploadService extends IntentService implements OnDatatransferPr
                 Log_OC.d(TAG, "Calling uploadFile for " + upload);
                 RemoteOperationResult uploadResult = uploadFile(uploadDbObject);
                 
-                updateDataseUploadResult(uploadResult, mCurrentUpload);
+                updateDatabaseUploadResult(uploadResult, mCurrentUpload);
                 notifyUploadResult(uploadResult, mCurrentUpload);
                 sendFinalBroadcast(uploadResult, mCurrentUpload);                
                 if (!shouldRetryFailedUpload(uploadResult)) {
@@ -1148,7 +1148,7 @@ public class FileUploadService extends IntentService implements OnDatatransferPr
     /**
      * Updates the persistent upload database with upload result.
      */
-    private void updateDataseUploadResult(RemoteOperationResult uploadResult, UploadFileOperation upload) {
+    private void updateDatabaseUploadResult(RemoteOperationResult uploadResult, UploadFileOperation upload) {
         // result: success or fail notification
         Log_OC.d(TAG, "updateDataseUploadResult uploadResult: " + uploadResult + " upload: " + upload);
         if (uploadResult.isCancelled()) {

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

@@ -174,14 +174,14 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                 if(uploadObject.getLastResult() != null){
                     status = "Last failure: "
                         + uploadObject.getLastResult().getLogMessage();
-                    String laterReason =FileUploadService.getUploadLaterReason(mActivity, uploadObject);
-                    if(laterReason != null) {
-                        //Upload is delayed, show reason.
-                        status += "\n" + laterReason;
-                    }
                 } else {
                     status = "Upload will be retried shortly.";
                 }
+                String laterReason = FileUploadService.getUploadLaterReason(mActivity, uploadObject);
+                if(laterReason != null) {
+                    //Upload failed once but is delayed now, show reason.
+                    status += "\n" + laterReason;
+                }
                 break;
             case UPLOAD_LATER:
                 status = FileUploadService.getUploadLaterReason(mActivity, uploadObject);