Minor improvements for upload cancelation and conflicts in synchronization

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

@@ -390,11 +390,16 @@ public class RemoteOperationResult implements Serializable {
 
         } else if (mCode == ResultCode.ACCOUNT_NOT_THE_SAME) {
             return "Authenticated with a different account than the one updating";
+
         } else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) {
                 return "The file name contains an forbidden character";
+
         } else if (mCode == ResultCode.FILE_NOT_FOUND) {
-	  	return "Local file does not exist";
- 	}
+	  	    return "Local file does not exist";
+
+ 	    } else if (mCode == ResultCode.SYNC_CONFLICT) {
+            return "Synchronization conflict";
+        }
 
         return "Operation finished with HTTP status code " + mHttpCode + " (" +
                 (isSuccess() ? "success" : "fail") + ")";

src/com/owncloud/android/lib/common/utils/Log_OC.java

@@ -32,8 +32,7 @@ public class Log_OC {
     }
 
     public static void i(String TAG, String message){
-
-        // Write the log message to the file
+        Log.i(TAG, message);
         appendLog(TAG+" : "+ message);
     }