aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamed <mohamed@zenadi.com>2017-05-25 20:57:12 +0100
committerMohamed <mohamed@zenadi.com>2017-05-25 20:57:12 +0100
commit708fce2e4001b731833984f66645dfc90f1452c2 (patch)
treeed323da90a003b7ac1df73cb9f2105ef7554a4e7
parent210c41ec25c9d8389723a5755e7db7a2b0e1c27b (diff)
no longer needed as it was fixed in OpenKeychain
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java6
-rw-r--r--app/src/main/res/layout/decrypt_layout.xml17
2 files changed, 0 insertions, 23 deletions
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 d9a88f3c..9a6ff61a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -416,7 +416,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
break;
}
case REQUEST_CODE_DECRYPT_AND_VERIFY: {
- findViewById(R.id.progress_bar_label).setVisibility(View.GONE);
decryptAndVerify(data);
break;
}
@@ -488,9 +487,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) {
try {
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);
findViewById(R.id.crypto_container).setVisibility(View.VISIBLE);
@@ -645,8 +641,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
public void decryptAndVerify(Intent data) {
data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
- findViewById(R.id.progress_bar).setVisibility(View.VISIBLE);
-
try {
InputStream is = FileUtils.openInputStream(new File(getIntent().getExtras().getString("FILE_PATH")));
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 0c7850d8..7d5d9408 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -48,23 +48,6 @@
android:layout_marginTop="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
android:id="@+id/crypto_container"
android:orientation="vertical"