diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java index 6b8eb2ee8..ae47e8133 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java @@ -52,6 +52,7 @@ public class TrustedCertificateImportActivity extends AppCompatActivity "application/x-pem-file", "application/pkix-cert" }; + private Uri mCertificateUri; @TargetApi(Build.VERSION_CODES.KITKAT) @Override @@ -82,18 +83,29 @@ public class TrustedCertificateImportActivity extends AppCompatActivity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); switch (requestCode) { case OPEN_DOCUMENT: if (resultCode == Activity.RESULT_OK && data != null) { - importCertificate(data.getData()); + mCertificateUri = data.getData(); return; } finish(); return; } - super.onActivityResult(requestCode, resultCode, data); + } + + @Override + protected void onPostResume() + { + super.onPostResume(); + if (mCertificateUri != null) + { + importCertificate(mCertificateUri); + mCertificateUri = null; + } } /** |