From a879b4a4a1f6e7119fc514d536288f30d1f44435 Mon Sep 17 00:00:00 2001 From: "r.morawski" Date: Wed, 28 Oct 2020 14:50:44 +0100 Subject: [PATCH] Removed toast about no external permission storage on first run and moved to requestpermissionsresult. Also finish activity when user denied. --- ..._com_android_support_support_compat_24_2_0.xml | 15 --------------- ...com_android_support_support_core_ui_24_2_0.xml | 15 --------------- ..._android_support_support_core_utils_24_2_0.xml | 15 --------------- ...om_android_support_support_fragment_24_2_0.xml | 15 --------------- ...ndroid_support_support_media_compat_24_2_0.xml | 15 --------------- ...dle__com_android_support_support_v4_24_2_0.xml | 10 ---------- src/uk/ac/swansea/eduroamcat/EAPMetadata.java | 8 ++++---- 7 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 .idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml deleted file mode 100644 index e21eb44..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml deleted file mode 100644 index 9f232f7..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml deleted file mode 100644 index 9776304..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml deleted file mode 100644 index 2937fa1..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml deleted file mode 100644 index 81eef81..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml deleted file mode 100644 index 3732e71..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/uk/ac/swansea/eduroamcat/EAPMetadata.java b/src/uk/ac/swansea/eduroamcat/EAPMetadata.java index 0d88c26..a2d95c5 100644 --- a/src/uk/ac/swansea/eduroamcat/EAPMetadata.java +++ b/src/uk/ac/swansea/eduroamcat/EAPMetadata.java @@ -61,6 +61,7 @@ public class EAPMetadata extends Activity { //global clietn cert value for retry static NodeList clientCert; private static final int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0; + private boolean configFileError = false; public boolean testExternalStorage() { @@ -80,8 +81,9 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in this.recreate(); } else { Toast.makeText(this, this.getString(R.string.storagePermission), Toast.LENGTH_LONG).show(); + configFileError = true; + finish(); } - return; } } } @@ -99,7 +101,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_eapmetadata); Intent configIntent = getIntent(); InputStream configIn = null; - boolean configFileError = false; + String pathToDownload =""; eduroamCAT.debug("Got eap-config:"+configIntent.getDataString()); @@ -109,8 +111,6 @@ protected void onCreate(Bundle savedInstanceState) { ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); - configFileError=true; - Toast.makeText(this, this.getString(R.string.storagePermission), Toast.LENGTH_LONG).show(); } else configFileError=false;