follow: remove progress bar when waiting for OpenKeychain

This commit is contained in:
Mohamed 2017-05-25 21:07:26 +01:00
parent 708fce2e40
commit 72fcf46ca9

View file

@ -566,9 +566,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
if (requestCode == REQUEST_CODE_EDIT && os != null) { if (requestCode == REQUEST_CODE_EDIT && 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);
findViewById(R.id.crypto_container).setVisibility(View.VISIBLE); findViewById(R.id.crypto_container).setVisibility(View.VISIBLE);
Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf");
@ -600,11 +597,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: {
Log.i("PgpHandler", "RESULT_CODE_USER_INTERACTION_REQUIRED"); Log.i("PgpHandler", "RESULT_CODE_USER_INTERACTION_REQUIRED");
View progress_bar_label = findViewById(R.id.progress_bar_label);
if (progress_bar_label != null) {
progress_bar_label.setVisibility(View.VISIBLE);
}
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
try { try {
PgpHandler.this.startIntentSenderForResult(pi.getIntentSender(), PgpHandler.this.startIntentSenderForResult(pi.getIntentSender(),
@ -701,8 +693,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
// exactly same as decrypt, only we want a different callback // exactly same as decrypt, only we want a different callback
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")));