nicolabs/Android-Password-Store
1
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store.git synced 2025-09-07 16:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

no longer needed as it was fixed in OpenKeychain

Browse source
This commit is contained in:
Mohamed 2017-05-25 20:57:12 +01:00
parent 210c41ec25
commit 708fce2e40
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,7 +416,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
break; break;
} }
case REQUEST_CODE_DECRYPT_AND_VERIFY: { case REQUEST_CODE_DECRYPT_AND_VERIFY: {
findViewById(R.id.progress_bar_label).setVisibility(View.GONE);
decryptAndVerify(data); decryptAndVerify(data);
break; break;
} }
@ -488,9 +487,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) { if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) {
try { try {
if (returnToCiphertextField) { if (returnToCiphertextField) {
findViewById(R.id.progress_bar).setVisibility(View.GONE);
findViewById(R.id.progress_bar_label).setVisibility(View.GONE);
boolean showPassword = settings.getBoolean("show_password", true); boolean showPassword = settings.getBoolean("show_password", true);
findViewById(R.id.crypto_container).setVisibility(View.VISIBLE); findViewById(R.id.crypto_container).setVisibility(View.VISIBLE);
@ -645,8 +641,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
public void decryptAndVerify(Intent data) { public void decryptAndVerify(Intent data) {
data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY); data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
findViewById(R.id.progress_bar).setVisibility(View.VISIBLE);
try { try {
InputStream is = FileUtils.openInputStream(new File(getIntent().getExtras().getString("FILE_PATH"))); InputStream is = FileUtils.openInputStream(new File(getIntent().getExtras().getString("FILE_PATH")));

17
app/src/main/res/layout/decrypt_layout.xml
View file

@ -48,23 +48,6 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" /> android:layout_marginBottom="16dp" />
<ProgressBar
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:id="@+id/progress_bar"
android:layout_gravity="center_horizontal"
android:indeterminate="true"
android:visibility="gone"/>
<TextView
android:id="@+id/progress_bar_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Authentication Required"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@+id/crypto_container" android:id="@+id/crypto_container"
android:orientation="vertical" android:orientation="vertical"