download file if "use server version"

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ConflictsResolveDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 3849407..163197c 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -42,7 +42,8 @@ public class ConflictsResolveDialog extends DialogFragment {
     public static enum Decision { 
         CANCEL,
         KEEP_BOTH,
     public static enum Decision { 
         CANCEL,
         KEEP_BOTH,

-        OVERWRITE
+        OVERWRITE,
+        SERVER

     }
     
     OnConflictDecisionMadeListener mListener;
     }
     
     OnConflictDecisionMadeListener mListener;


@@ -85,7 +86,7 @@ public class ConflictsResolveDialog extends DialogFragment {
                            @Override
                            public void onClick(DialogInterface dialog, int which) {
                                if (mListener != null)
                            @Override
                            public void onClick(DialogInterface dialog, int which) {
                                if (mListener != null)

-                                   mListener.conflictDecisionMade(Decision.CANCEL);
+                                   mListener.conflictDecisionMade(Decision.SERVER);

                            }
                    })
                    .create();
                            }
                    })
                    .create();