changes due to rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/operations/CommentFileOperation.java

@@ -109,4 +109,4 @@ public class CommentFileOperation extends SyncOperation {
     private boolean isSuccess(int status) {
         return status == HttpStatus.SC_CREATED;
     }
-}
+}

src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -196,7 +196,7 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
     @OnClick(R.id.submitComment)
     public void submitComment() {
         if (commentInput.getText().toString().trim().length() > 0) {
-            new RestoreFileVersionTask.SubmitCommentTask(commentInput.getText().toString(), userId, file.getLocalId(),
+            new SubmitCommentTask(commentInput.getText().toString(), userId, file.getLocalId(),
                     callback, ownCloudClient).execute();
         }
     }
@@ -411,17 +411,6 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
         // TODO implement activity click
     }
 
-    @Override
-    public void onSuccess(String message) {
-        Snackbar.make(recyclerView, message, Snackbar.LENGTH_LONG).show();
-        fetchAndSetData(null);
-    }
-
-    @Override
-    public void onSuccess() {
-        fetchAndSetData(null);
-    }
-
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);

src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -34,7 +34,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.apache.commons.codec.binary.Hex;
 
-import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;