Fixed compatibility issue in local deletion and text typo

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / fragment / ConfirmationDialogFragment.java

diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
index c5394f8..cc6a0f7 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
@@ -15,13 +15,20 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
     public final static String ARG_CONF_RESOURCE_ID = "resource_id";
     public final static String ARG_CONF_ARGUMENTS = "string_array";
     
     public final static String ARG_CONF_RESOURCE_ID = "resource_id";
     public final static String ARG_CONF_ARGUMENTS = "string_array";
     

-    ConfirmationDialogFragmentListener mListener;
+    public final static String ARG_POSITIVE_BTN_RES = "positive_btn_res";
+    public final static String ARG_NEUTRAL_BTN_RES = "neutral_btn_res";
+    public final static String ARG_NEGATIVE_BTN_RES = "negative_btn_res";

     
     

-    public static ConfirmationDialogFragment newInstance(int string_id, String[] arguments) {
+    private ConfirmationDialogFragmentListener mListener;
+    
+    public static ConfirmationDialogFragment newInstance(int string_id, String[] arguments, int posBtn, int neuBtn, int negBtn) {

         ConfirmationDialogFragment frag = new ConfirmationDialogFragment();
         Bundle args = new Bundle();
         args.putInt(ARG_CONF_RESOURCE_ID, string_id);
         args.putStringArray(ARG_CONF_ARGUMENTS, arguments);
         ConfirmationDialogFragment frag = new ConfirmationDialogFragment();
         Bundle args = new Bundle();
         args.putInt(ARG_CONF_RESOURCE_ID, string_id);
         args.putStringArray(ARG_CONF_ARGUMENTS, arguments);

+        args.putInt(ARG_POSITIVE_BTN_RES, posBtn);
+        args.putInt(ARG_NEUTRAL_BTN_RES, neuBtn);
+        args.putInt(ARG_NEGATIVE_BTN_RES, negBtn);

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


@@ -34,34 +41,53 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         Object[] confirmationTarget = getArguments().getStringArray(ARG_CONF_ARGUMENTS);
         int resourceId = getArguments().getInt(ARG_CONF_RESOURCE_ID, -1);
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         Object[] confirmationTarget = getArguments().getStringArray(ARG_CONF_ARGUMENTS);
         int resourceId = getArguments().getInt(ARG_CONF_RESOURCE_ID, -1);

+        int posBtn = getArguments().getInt(ARG_POSITIVE_BTN_RES, -1);
+        int neuBtn = getArguments().getInt(ARG_NEUTRAL_BTN_RES, -1);
+        int negBtn = getArguments().getInt(ARG_NEGATIVE_BTN_RES, -1);
+        

         if (confirmationTarget == null || resourceId == -1) {
             Log.wtf(getTag(), "Calling confirmation dialog without resource or arguments");
             return null;
         }
 
         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)
-                .setMessage(String.format(getString(resourceId), confirmationTarget))
-                .setPositiveButton(R.string.common_ok,
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+            .setIcon(android.R.drawable.ic_dialog_alert)
+            .setMessage(String.format(getString(resourceId), confirmationTarget))
+            .setTitle(android.R.string.dialog_alert_title);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+            builder.setIconAttribute(android.R.attr.alertDialogIcon);
+        }
+        
+        if (posBtn != -1)
+            builder.setPositiveButton(posBtn,

                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {

-                            mListener.onConfirmation(true, getTag()); 
+                            mListener.onConfirmation(getTag()); 

                         }
                         }

-                    }
-                )
-                .setNegativeButton(R.string.common_cancel,
+                    });
+        if (neuBtn != -1)
+            builder.setNeutralButton(neuBtn,

                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {

-                            mListener.onConfirmation(false, getTag()); 
+                            mListener.onNeutral(getTag()); 
+                        }
+                    });
+        if (negBtn != -1)
+            builder.setNegativeButton(negBtn,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            mListener.onCancel(getTag());

                         }
                         }

-                    }
-                )
-                .create();
+                    });
+      return builder.create();

     }
     
     
     public interface ConfirmationDialogFragmentListener {
     }
     
     
     public interface ConfirmationDialogFragmentListener {

-        public void onConfirmation(boolean confirmation, String callerTag);
+        public void onConfirmation(String callerTag);
+        public void onNeutral(String callerTag);
+        public void onCancel(String callerTag);

     }
     
 }
     }
     
 }