浏览代码

Remove useless code to identify pdf files

Juan Carlos González Cabrero 9 年之前
父节点
当前提交
996fdc4fa4
共有 1 个文件被更改,包括 0 次插入28 次删除
  1. 0 28
      src/com/owncloud/android/operations/UploadFileOperation.java

+ 0 - 28
src/com/owncloud/android/operations/UploadFileOperation.java

@@ -70,31 +70,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
  */
 public class UploadFileOperation extends SyncOperation {
 public class UploadFileOperation extends SyncOperation {
 
 
-
-    private static final String MIME_TYPE_PDF = "application/pdf";
-    private static final String FILE_EXTENSION_PDF = ".pdf";
-
     public static final int CREATED_BY_USER = 0;
     public static final int CREATED_BY_USER = 0;
     public static final int CREATED_AS_INSTANT_PICTURE = 1;
     public static final int CREATED_AS_INSTANT_PICTURE = 1;
     public static final int CREATED_AS_INSTANT_VIDEO = 2;
     public static final int CREATED_AS_INSTANT_VIDEO = 2;
 
 
-
-    /**
-     * Checks if content provider, using the content:// scheme, returns a file with mime-type
-     * 'application/pdf' but file has not extension
-     * @param localPath         Full path to a file in the local file system.
-     * @param mimeType          MIME type of the file.
-     * @return true if is needed to add the pdf file extension to the file
-     *
-     * TODO - move to OCFile or Utils class
-     */
-    private static boolean isPdfFileFromContentProviderWithoutExtension(String localPath,
-                                                                        String mimeType) {
-        return localPath.startsWith(UriUtils.URI_CONTENT_SCHEME) &&
-                mimeType.equals(MIME_TYPE_PDF) &&
-                !localPath.endsWith(FILE_EXTENSION_PDF);
-    }
-
     public static OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType) {
     public static OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType) {
 
 
         // MIME type
         // MIME type
@@ -102,11 +81,6 @@ public class UploadFileOperation extends SyncOperation {
             mimeType = MimetypeIconUtil.getBestMimeTypeByFilename(localPath);
             mimeType = MimetypeIconUtil.getBestMimeTypeByFilename(localPath);
         }
         }
 
 
-        // TODO - this is a horrible special case that should not be handled this way
-        if (isPdfFileFromContentProviderWithoutExtension(localPath, mimeType)){
-            remotePath += FILE_EXTENSION_PDF;
-        }
-
         OCFile newFile = new OCFile(remotePath);
         OCFile newFile = new OCFile(remotePath);
         newFile.setStoragePath(localPath);
         newFile.setStoragePath(localPath);
         newFile.setLastSyncDateForProperties(0);
         newFile.setLastSyncDateForProperties(0);
@@ -126,8 +100,6 @@ public class UploadFileOperation extends SyncOperation {
         return newFile;
         return newFile;
     }
     }
 
 
-
-
     private static final String TAG = UploadFileOperation.class.getSimpleName();
     private static final String TAG = UploadFileOperation.class.getSimpleName();
 
 
     private Account mAccount;
     private Account mAccount;