From: rmceoin Date: Fri, 30 Jan 2009 00:58:21 +0000 (+0000) Subject: Changed PassView to use TextView. X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=a1a3998f00b7ebd4ef7696095a632bffc6cb4780;p=android-vcpass-oisafe Changed PassView to use TextView. Import now checks for passwordsafe.csv. Set various debug = true to false. git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1875 72b678ce-9140-0410-bee8-679b907dd61a --- diff --git a/res/layout/pass_view.xml b/res/layout/pass_view.xml index d05799f..c7c7da7 100644 --- a/res/layout/pass_view.xml +++ b/res/layout/pass_view.xml @@ -36,8 +36,12 @@ android:layout_marginRight="2sp" android:layout_marginBottom="1sp" android:text="@string/description" /> - @@ -47,8 +51,12 @@ android:layout_height="wrap_content" android:layout_marginRight="2sp" android:text="@string/website" /> - @@ -63,8 +71,12 @@ android:layout_height="wrap_content" android:layout_marginRight="2sp" android:text="@string/username" /> - @@ -75,8 +87,12 @@ android:layout_height="wrap_content" android:layout_marginRight="2sp" android:text="@string/password" /> - @@ -86,9 +102,13 @@ - diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java index 85095e7..f87971e 100644 --- a/src/org/openintents/safe/CategoryList.java +++ b/src/org/openintents/safe/CategoryList.java @@ -106,6 +106,7 @@ public class CategoryList extends ListActivity { private static final String EXPORT_FILENAME = "/sdcard/oisafe.csv"; public static final String BACKUP_FILENAME = "/sdcard/oisafe.xml"; + private static final String PASSWORDSAFE_IMPORT_FILENAME = "/sdcard/passwordsafe.csv"; public static final String KEY_ID = "id"; // Intent keys @@ -815,7 +816,14 @@ public class CategoryList extends ListActivity { } public void importDatabase(){ - final String filename=EXPORT_FILENAME; + final String filename; + File oiImport=new File(EXPORT_FILENAME); + File pwsImport=new File(PASSWORDSAFE_IMPORT_FILENAME); + if (oiImport.exists() || !pwsImport.exists()) { + filename=EXPORT_FILENAME; + }else{ + filename=PASSWORDSAFE_IMPORT_FILENAME; + } File csvFile=new File(filename); if (!csvFile.exists()) { String msg=getString(R.string.import_file_missing) + " " + diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java index 802e665..1d75651 100644 --- a/src/org/openintents/safe/CryptoHelper.java +++ b/src/org/openintents/safe/CryptoHelper.java @@ -52,7 +52,7 @@ import android.util.Log; */ public class CryptoHelper { - private static final boolean debug = true; + private static final boolean debug = false; private static String TAG = "CryptoHelper"; protected static PBEKeySpec pbeKeySpec; protected static PBEParameterSpec pbeParamSpec; diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java index 092b65e..371a041 100644 --- a/src/org/openintents/safe/IntentHandler.java +++ b/src/org/openintents/safe/IntentHandler.java @@ -48,7 +48,7 @@ import android.widget.Toast; */ public class IntentHandler extends Activity { - private static final boolean debug = !false; + private static final boolean debug = false; private static String TAG = "IntentHandler"; private static final int REQUEST_CODE_ASK_PASSWORD = 1; diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java index 8554341..c345bb3 100644 --- a/src/org/openintents/safe/PassView.java +++ b/src/org/openintents/safe/PassView.java @@ -54,11 +54,11 @@ public class PassView extends Activity { public static final int REQUEST_EDIT_PASS = 1; - private EditText descriptionText; - private EditText passwordText; - private EditText usernameText; - private EditText websiteText; - private EditText noteText; + private TextView descriptionText; + private TextView passwordText; + private TextView usernameText; + private TextView websiteText; + private TextView noteText; private TextView lastEditedText; private TextView uniqueNameText; private TextView packageAccessText; @@ -92,11 +92,11 @@ public class PassView extends Activity { setContentView(R.layout.pass_view); - descriptionText = (EditText) findViewById(R.id.description); - websiteText = (EditText) findViewById(R.id.website); - usernameText = (EditText) findViewById(R.id.username); - passwordText = (EditText) findViewById(R.id.password); - noteText = (EditText) findViewById(R.id.note); + descriptionText = (TextView) findViewById(R.id.description); + websiteText = (TextView) findViewById(R.id.website); + usernameText = (TextView) findViewById(R.id.username); + passwordText = (TextView) findViewById(R.id.password); + noteText = (TextView) findViewById(R.id.note); lastEditedText = (TextView) findViewById(R.id.last_edited); uniqueNameText = (TextView) findViewById(R.id.uniquename); packageAccessText = (TextView) findViewById(R.id.packageaccess); diff --git a/src/org/openintents/safe/service/ServiceDispatchImpl.java b/src/org/openintents/safe/service/ServiceDispatchImpl.java index 50ee468..eccea2b 100644 --- a/src/org/openintents/safe/service/ServiceDispatchImpl.java +++ b/src/org/openintents/safe/service/ServiceDispatchImpl.java @@ -35,7 +35,7 @@ import android.util.Log; import android.os.CountDownTimer; public class ServiceDispatchImpl extends Service { - private static boolean debug = true; + private static boolean debug = false; private static String TAG = "ServiceDispatchIMPL"; private CryptoHelper ch; private String salt;