kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix password copy no longer working due to a typo

Browse source
This commit is contained in:
Mohamed Zenadi 2017-07-29 10:57:09 +01:00
parent 43f479d773
commit 1046634a3c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
View file

@ -77,7 +77,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
public static final int REQUEST_CODE_EDIT = 9916; public static final int REQUEST_CODE_EDIT = 9916;
public static final int REQUEST_CODE_SELECT_FOLDER = 9917; public static final int REQUEST_CODE_SELECT_FOLDER = 9917;
private String decodedPassword = ""; private PasswordEntry passwordEntry = null;
public final class Constants { public final class Constants {
public static final String TAG = "Keychain"; public static final String TAG = "Keychain";
@ -237,6 +237,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
if (findViewById(R.id.share_password_as_plaintext) == null) if (findViewById(R.id.share_password_as_plaintext) == null)
return; return;
final String decodedPassword = passwordEntry != null ? passwordEntry.getPassword() : "";
Intent sendIntent = new Intent(); Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND); sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, decodedPassword); sendIntent.putExtra(Intent.EXTRA_TEXT, decodedPassword);
@ -251,6 +252,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
setTimer(); setTimer();
final String decodedPassword = passwordEntry != null ? passwordEntry.getPassword() : "";
ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", decodedPassword); ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", decodedPassword);
clipboard.setPrimaryClip(clip); clipboard.setPrimaryClip(clip);
@ -367,7 +369,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
} }
} }
} }
decodedPassword = ""; passwordEntry = null;
if (findViewById(R.id.crypto_password_show) != null) { if (findViewById(R.id.crypto_password_show) != null) {
// clear password; if decrypt changed to encrypt layout via edit button, no need // clear password; if decrypt changed to encrypt layout via edit button, no need
((TextView) findViewById(R.id.crypto_password_show)).setText(""); ((TextView) findViewById(R.id.crypto_password_show)).setText("");
@ -495,6 +497,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf");
final PasswordEntry entry = new PasswordEntry(os); final PasswordEntry entry = new PasswordEntry(os);
passwordEntry = entry;
textViewPassword.setTypeface(monoTypeface); textViewPassword.setTypeface(monoTypeface);
textViewPassword.setText(entry.getPassword()); textViewPassword.setText(entry.getPassword());
@ -586,11 +589,11 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf");
final PasswordEntry entry = new PasswordEntry(os); final PasswordEntry entry = new PasswordEntry(os);
decodedPassword = entry.getPassword(); passwordEntry = entry;
textViewPassword textViewPassword
.setTypeface(monoTypeface); .setTypeface(monoTypeface);
textViewPassword textViewPassword
.setText(decodedPassword); .setText(entry.getPassword());
String extraContent = os.toString("UTF-8").replaceFirst(".*\n", ""); String extraContent = os.toString("UTF-8").replaceFirst(".*\n", "");
if (extraContent.length() != 0) { if (extraContent.length() != 0) {