make confirmation dialog more universal

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9d167e3..77c6a1c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -131,7 +131,7 @@
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     

-       <string name="confirmation_alert">"Do you really want %1$s ?"</string>
+       <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>

 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>

diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
index e2769b1..c5394f8 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;

+import android.util.Log;

 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 


@@ -11,14 +12,16 @@ import eu.alefzero.owncloud.R;
 
 public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
 
 public class ConfirmationDialogFragment extends SherlockDialogFragment {
 

-    public final static String ARG_CONF_TARGET = "target";
+    public final static String ARG_CONF_RESOURCE_ID = "resource_id";
+    public final static String ARG_CONF_ARGUMENTS = "string_array";

     
     ConfirmationDialogFragmentListener mListener;
     
     
     ConfirmationDialogFragmentListener mListener;
     

-    public static ConfirmationDialogFragment newInstance(String confirmationTarget) {
+    public static ConfirmationDialogFragment newInstance(int string_id, String[] arguments) {

         ConfirmationDialogFragment frag = new ConfirmationDialogFragment();
         Bundle args = new Bundle();
         ConfirmationDialogFragment frag = new ConfirmationDialogFragment();
         Bundle args = new Bundle();

-        args.putString(ARG_CONF_TARGET, confirmationTarget);
+        args.putInt(ARG_CONF_RESOURCE_ID, string_id);
+        args.putStringArray(ARG_CONF_ARGUMENTS, arguments);

         frag.setArguments(args);
         return frag;
     }
         frag.setArguments(args);
         return frag;
     }


@@ -29,13 +32,16 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {

-        String confirmationTarget = getArguments().getString(ARG_CONF_TARGET);
-        if (confirmationTarget == null)
-            confirmationTarget = "";
+        Object[] confirmationTarget = getArguments().getStringArray(ARG_CONF_ARGUMENTS);
+        int resourceId = getArguments().getInt(ARG_CONF_RESOURCE_ID, -1);
+        if (confirmationTarget == null || resourceId == -1) {
+            Log.wtf(getTag(), "Calling confirmation dialog without resource or arguments");
+            return null;
+        }

 
         return new AlertDialog.Builder(getActivity())
                 .setIcon(android.R.drawable.ic_dialog_alert)
 
         return new AlertDialog.Builder(getActivity())
                 .setIcon(android.R.drawable.ic_dialog_alert)

-                .setMessage(String.format(getString(R.string.confirmation_alert), confirmationTarget))
+                .setMessage(String.format(getString(resourceId), confirmationTarget))

                 .setPositiveButton(R.string.common_ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                 .setPositiveButton(R.string.common_ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 2f694f2..ed98635 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -241,7 +241,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 break;\r
             }   \r
             case R.id.fdRemoveBtn: {\r
                 break;\r
             }   \r
             case R.id.fdRemoveBtn: {\r

-                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance("to remove " + mFile.getFileName());\r
+                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(R.string.confirmation_remove_alert, new String[]{mFile.getFileName()});\r

                 confDialog.setOnConfirmationListener(this);\r
                 confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);\r
                 break;\r
                 confDialog.setOnConfirmationListener(this);\r
                 confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);\r
                 break;\r