From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 21 Nov 2012 16:48:56 +0000 (+0100)
Subject: Fix conflict dialog to finish the container activity if BACK is pressed
X-Git-Tag: oc-android-1.4.3~91
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6de96a9817b55e1b1762433bb849c59f869d9034?hp=--cc

Fix conflict dialog to finish the container activity if BACK is pressed
---

6de96a9817b55e1b1762433bb849c59f869d9034
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 1319562e..1c89790c 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -109,6 +109,11 @@ public class ConflictsResolveDialog extends SherlockDialogFragment {
         }
     }
     
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        mListener.ConflictDecisionMade(Decision.CANCEL);
+    }
+    
     public interface OnConflictDecisionMadeListener {
         public void ConflictDecisionMade(Decision decision);
     }