From cb8216b5878183005890a6deefde0797462de966 Mon Sep 17 00:00:00 2001 From: Zeapo Date: Sat, 2 Aug 2014 23:10:09 +0100 Subject: improved ui for decrypt/encrypt --- .../java/com/zeapo/pwdstore/PasswordStore.java | 13 +++ .../java/com/zeapo/pwdstore/crypto/PgpHandler.java | 32 ++++-- app/src/main/res/layout/activity_pgp_handler.xml | 71 +++---------- app/src/main/res/layout/decrypt_layout.xml | 115 +++++++++++++++++++++ app/src/main/res/layout/encrypt_layout.xml | 82 +++++++++++++++ 5 files changed, 246 insertions(+), 67 deletions(-) create mode 100644 app/src/main/res/layout/decrypt_layout.xml create mode 100644 app/src/main/res/layout/encrypt_layout.xml diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 79f1fc2d..fdc90518 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -176,6 +176,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI intent.putExtra("PGP-ID", FileUtils.readFileToString(PasswordRepository.getFile("/.gpg-id"))); intent.putExtra("NAME", item.getName()); intent.putExtra("FILE_PATH", item.getFile().getAbsolutePath()); + intent.putExtra("Operation", "DECRYPT"); startActivity(intent); } catch (IOException e) { @@ -192,5 +193,17 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI public void createPassword(View v) { System.out.println("Adding file to : " + this.currentDir.getAbsolutePath()); + this.leftActivity = true; + + try { + Intent intent = new Intent(this, PgpHandler.class); + intent.putExtra("PGP-ID", FileUtils.readFileToString(PasswordRepository.getFile("/.gpg-id"))); + intent.putExtra("NAME", "test.gpg"); + intent.putExtra("FILE_PATH", this.currentDir.getAbsolutePath() + "/test.gpg"); + intent.putExtra("Operation", "ENCRYPT"); + startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index 198a2d9d..72775400 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -1,11 +1,11 @@ package com.zeapo.pwdstore.crypto; +import android.app.ActionBar; import android.app.Activity; import android.app.PendingIntent; import android.content.Intent; import android.content.IntentSender; import android.content.SharedPreferences; -import android.graphics.Typeface; import android.os.AsyncTask; import android.os.Bundle; import android.os.SystemClock; @@ -15,10 +15,12 @@ import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import android.widget.GridLayout.LayoutParams; import com.zeapo.pwdstore.R; import com.zeapo.pwdstore.UserPreference; @@ -56,10 +58,19 @@ public class PgpHandler extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pgp_handler); Bundle extra = getIntent().getExtras(); - ((TextView) findViewById(R.id.crypto_password_file)).setText(extra.getString("NAME")); + if (extra.getString("Operation").equals("DECRYPT")) { + setContentView(R.layout.decrypt_layout); + + ((TextView) findViewById(R.id.crypto_password_file)).setText(extra.getString("NAME")); + findViewById(R.id.crypto_show_button).setVisibility(View.VISIBLE); + } else if (extra.getString("Operation").equals("ENCRYPT")) { + setContentView(R.layout.encrypt_layout); + + ((EditText) findViewById(R.id.crypto_password_edit)).setText(extra.getString("NAME")); + findViewById(R.id.crypto_password_edit_layout).setVisibility(View.VISIBLE); + } // some persistance SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); @@ -136,16 +147,16 @@ public class PgpHandler extends Activity { @Override protected void onPreExecute() { - ((LinearLayout) findViewById(R.id.crypto_password_show_layout)).setVisibility(View.VISIBLE); + LinearLayout container = (LinearLayout) findViewById(R.id.crypto_container); + container.setVisibility(View.VISIBLE); + TextView extraText = (TextView) findViewById(R.id.crypto_extra_show); if (extraText.getText().length() != 0) ((LinearLayout) findViewById(R.id.crypto_extra_show_layout )).setVisibility(View.VISIBLE); this.pb = (ProgressBar) findViewById(R.id.pbLoading); - this.pb.setVisibility(ProgressBar.VISIBLE); this.pb.setMax(SHOW_TIME); - } @Override @@ -161,10 +172,8 @@ public class PgpHandler extends Activity { protected void onPostExecute(Boolean b) { //clear password ((TextView) findViewById(R.id.crypto_password_show)).setText(""); - ((LinearLayout) findViewById(R.id.crypto_password_show_layout)).setVisibility(View.INVISIBLE); - ((LinearLayout) findViewById(R.id.crypto_extra_show_layout)).setVisibility(View.INVISIBLE); - // run a background job and once complete - this.pb.setVisibility(ProgressBar.INVISIBLE); + findViewById(R.id.crypto_extra_show_layout).setVisibility(View.INVISIBLE); + findViewById(R.id.crypto_container).setVisibility(View.INVISIBLE); } @@ -197,7 +206,10 @@ public class PgpHandler extends Activity { try { Log.d(OpenPgpApi.TAG, "result: " + os.toByteArray().length + " str=" + os.toString("UTF-8")); + if (returnToCiphertextField) { + findViewById(R.id.crypto_container).setVisibility(View.VISIBLE); + String[] passContent = os.toString("UTF-8").split("\n"); ((TextView) findViewById(R.id.crypto_password_show)) .setText(passContent[0]); diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml index ced0ec33..b5dfba53 100644 --- a/app/src/main/res/layout/activity_pgp_handler.xml +++ b/app/src/main/res/layout/activity_pgp_handler.xml @@ -24,73 +24,30 @@ android:id="@+id/crypto_password_file" android:layout_gravity="center_vertical" android:layout_marginLeft="8dp" - android:layout_column="0"/> + android:layout_column="0" + android:layout_row="0"/> - - - - - - - - - - - - - - + android:onClick="decrypt" + android:layout_column="2" + android:layout_row="0"/> - - + android:layout_column="0" + android:layout_row="2" + android:layout_columnSpan="3" /> - + diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml new file mode 100644 index 00000000..8612ce3b --- /dev/null +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml new file mode 100644 index 00000000..4efc049f --- /dev/null +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3