Fixed compatibility issue in local deletion and text typo

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad92704..597c27b 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.188B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.189B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa3e924..f6bbc0f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -150,7 +150,7 @@
     
          <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
          <string name="confirmation_remove_local">Local only</string>
     
          <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
          <string name="confirmation_remove_local">Local only</string>

-         <string name="confirmation_remove_remote">Remove form server</string>
+         <string name="confirmation_remove_remote">Remove from server</string>

          <string name="confirmation_remove_remote_and_local">Both remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
          <string name="confirmation_remove_remote_and_local">Both remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>

diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
index 110f337..cc6a0f7 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
@@ -53,8 +53,10 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(String.format(getString(resourceId), confirmationTarget))
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(String.format(getString(resourceId), confirmationTarget))

-            .setIconAttribute(android.R.attr.alertDialogIcon)

             .setTitle(android.R.string.dialog_alert_title);
             .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,
         
         if (posBtn != -1)
             builder.setPositiveButton(posBtn,