OI Safe: added confirmation of Export

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2076 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a011939d7f22dc7b7480073b545a95ea7daa600..9e89ac3103181db55caa7fb92536712fe13f7783 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -115,4 +115,5 @@
     <uses-permission android:name="org.openintents.safe.ACCESS_INTENTS" />
     <uses-permission android:name="org.openintents.safe.ACCESS_SERVICE" />
     
+<uses-sdk android:minSdkVersion="1"></uses-sdk>
 </manifest> 
\ No newline at end of file

diff --git a/default.properties b/default.properties
index eba5c59ff571bffa59a08378be7cea9d22972eb4..9c6195ea1cc981e50de6f077cebf70e9c6715859 100644 (file)
--- a/default.properties
+++ b/default.properties
@@ -9,3 +9,14 @@
 
 # Project target.
 target=android-2
+# apk configurations. This property allows creation of APK files with limited
+# resources. For example, if your application contains many locales and
+# you wish to release multiple smaller apks instead of a large one, you can
+# define configuration to create apks with limited language sets.
+# Format is a comma separated list of configuration names. For each
+# configuration, a property will declare the resource configurations to
+# include. Example:
+#     apk-configurations=european,northamerica
+#     apk-config-european=en,fr,it,de,es
+#     apk-config-northamerica=en,es
+apk-configurations=

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5f033dccc3c1cc575f9560704ad226a7c99b3d48..fc7a24db94f967bbed84e4ed8158a388affaf243 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -65,7 +65,8 @@
        <string name="cannot_decrypt_category">Cannot decrypt category</string>
        <string name="cannot_decrypt_password">Cannot decrypt password</string>
        <string name="error_export">Error exporting database</string>\r
-       <string name="export_database">Export Database</string>
+       <string name="export_database">Export Database</string>\r
+       <string name="export_msg">This will export the password database to a plaintext file.  THIS IS VERY DANGEROUS.  Make sure that you delete the file after you are done with it.   Are you sure you want to export?</string>
        <string name="export_success">Export to '%s' successful.   Warning!   The file is not encrypted.</string>\r
        <string name="export_file_error">Unable to create export file 'oisafe.csv' on SDCARD.  You might try disconnecting USB from computer.</string>
        <string name="import_database">Import Database</string>\r

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index 80966dfc50799a046b323928d8ef6827fe0eb6cd..0b1d7ea9e60e7292c7b8271402ff37103e09281b 100644 (file)
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -529,7 +529,21 @@ public class CategoryList extends ListActivity {
                    startActivity(help);
                        break;
                case EXPORT_INDEX:
-                       exportDatabase();
+                       Dialog exportDialog = new AlertDialog.Builder(CategoryList.this)
+                       .setIcon(R.drawable.passicon)
+                       .setTitle(R.string.export_database)
+                       .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                               public void onClick(DialogInterface dialog, int whichButton) {
+                                       exportDatabase();
+                               }
+                       })
+                       .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                               public void onClick(DialogInterface dialog, int whichButton) {
+                               }
+                       }) 
+                       .setMessage(R.string.export_msg)
+                       .create();
+                       exportDialog.show();
                        break;
                case IMPORT_INDEX:
                        importDatabase();