From 6de96a9817b55e1b1762433bb849c59f869d9034 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Wed, 21 Nov 2012 17:48:56 +0100
Subject: [PATCH] Fix conflict dialog to finish the container activity if BACK
 is pressed

---
 src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java | 5 +++++
 1 file changed, 5 insertions(+)

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);
     }
-- 
2.11.0