Fix extension parse error, and variable refactoring

src/com/owncloud/android/operations/UploadFileOperation.java

@@ -120,7 +120,6 @@ public class UploadFileOperation extends SyncOperation {
     private int mCreatedBy = CREATED_BY_USER;
 
     private boolean mWasRenamed = false;
-    private String mOriginalFileName = null;
     private long mOCUploadId = -1;
     /**
      * Local path to file which is to be uploaded (before any possible renaming or moving).
@@ -163,7 +162,6 @@ public class UploadFileOperation extends SyncOperation {
         mForceOverwrite = forceOverwrite;
         mLocalBehaviour = localBehaviour;
         mOriginalStoragePath = mFile.getStoragePath();
-        mOriginalFileName = mFile.getFileName();
         mContext = context;
     }
 
@@ -196,7 +194,6 @@ public class UploadFileOperation extends SyncOperation {
         mForceOverwrite = forceOverwrite;
         mLocalBehaviour = localBehaviour;
         mOriginalStoragePath = mFile.getStoragePath();
-        mOriginalFileName = mFile.getFileName();
         mContext = context;
         mOCUploadId = upload.getUploadId();
         mCreatedBy = upload.getCreadtedBy();
@@ -208,7 +205,7 @@ public class UploadFileOperation extends SyncOperation {
     }
 
     public String getFileName() {
-        return mOriginalFileName;
+        return (mFile != null) ? mFile.getFileName() : null;
     }
 
     public OCFile getFile() {

src/com/owncloud/android/ui/activity/Uploader.java

@@ -575,7 +575,7 @@ public class Uploader extends FileActivity
                         // Add extension if it does not exists in the file name
                         int index = displayName.lastIndexOf(".");
                         if(index == -1 || MimeTypeMap.getSingleton().
-                                getMimeTypeFromExtension(displayName.substring(index)) == null) {
+                                getMimeTypeFromExtension(displayName.substring(index + 1)) == null) {
                             String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
                             displayName += (extension != null) ? "." + extension : "";
                         }