From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 20 Nov 2012 10:40:58 +0000 (+0100)
Subject: ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog
X-Git-Tag: oc-android-1.4.3~97
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b

ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog
---

diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index 057e0417..48676541 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -62,6 +62,7 @@ public class ConflictsResolveActivity extends SherlockFragmentActivity implement
         
         switch (decision) {
             case CANCEL:
+                finish();
                 return;
             case OVERWRITE:
                 i.putExtra(FileUploader.KEY_FORCE_OVERWRITE, true);