2 files changed, 17 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 74b134aa..073c24da 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -176,6 +176,18 @@ public class PasswordStore extends ActionBarActivity  {
         return super.onOptionsItemSelected(item);
     }
 
+    public void openSettings(View view) {
+        Intent intent;
+
+        try {
+            intent = new Intent(this, UserPreference.class);
+            startActivity(intent);
+        } catch (Exception e) {
+            System.out.println("Exception caught :(");
+            e.printStackTrace();
+        }
+    }
+
     public void getClone(View view){
         Intent intent = new Intent(this, GitActivity.class);
         intent.putExtra("Operation", GitActivity.REQUEST_CLONE);
@@ -284,6 +296,8 @@ public class PasswordStore extends ActionBarActivity  {
 
                 fragmentTransaction.addToBackStack("passlist");
 
+                getSupportActionBar().show();
+
                 fragmentTransaction.replace(R.id.main_layout, plist, "PasswordsList");
                 fragmentTransaction.commit();
             }
@@ -293,6 +307,8 @@ public class PasswordStore extends ActionBarActivity  {
                 fragmentManager.popBackStack();
             }
 
+            getSupportActionBar().hide();
+
             ToCloneOrNot cloneFrag = new ToCloneOrNot();
             fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot");
             fragmentTransaction.commit();
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 1dfa2047..6915ebd4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -190,7 +190,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
             @Override
             public void run() {
                 Toast.makeText(PgpHandler.this,
-                        "onError id:" + error.getErrorId() + "\n\n" + error.getMessage(),
+                        "Error from OpenKeyChain : " + error.getMessage(),
                         Toast.LENGTH_LONG).show();
                 Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
                 Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());