diff --git a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java index 742a20a..6b2e36e 100644 --- a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java +++ b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java @@ -29,7 +29,7 @@ public class CorsConfig extends AppCompatActivity { AmazonS3 s3client; BucketCrossOriginConfiguration bucketcors; boolean style; - boolean allorigins, pdfcompatible = false; + boolean allorigins, pdfcompatible, found = false; TextView origins; @Override @@ -66,13 +66,16 @@ public class CorsConfig extends AppCompatActivity { bucketcors = s3client.getBucketCrossOriginConfiguration(bucket); if (bucketcors != null) { List corsRules = bucketcors.getRules(); - for (CORSRule rule: corsRules) { - System.out.println("allowOrigins: "+rule.getAllowedOrigins()); - System.out.println("AllowedMethod: "+rule.getAllowedMethods()); - if (rule.getAllowedOrigins().toString().equals("[*]")) { - allorigins = true; - } else if (rule.getAllowedOrigins().toString().equals("["+pdfendpoint+"]")) { - pdfcompatible = true; + if (!corsRules.isEmpty()) { + found = true; + for (CORSRule rule: corsRules) { + System.out.println("allowOrigins: "+rule.getAllowedOrigins()); + System.out.println("AllowedMethod: "+rule.getAllowedMethods()); + if (rule.getAllowedOrigins().toString().equals("[*]")) { + allorigins = true; + } else if (rule.getAllowedOrigins().toString().equals("["+pdfendpoint+"]")) { + pdfcompatible = true; + } } } } @@ -85,6 +88,8 @@ public class CorsConfig extends AppCompatActivity { origins.setText(getResources().getString(R.string.cors_all)); } else if (pdfcompatible) { origins.setText(getResources().getString(R.string.cors_pdf)); + } else if (found) { + origins.setText(getResources().getString(R.string.cors_npdf)); } else { origins.setText(getResources().getString(R.string.cors_none)); } diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml index 63fb2fc..5e46028 100644 --- a/app/src/main/res/layout/activity_cors_config.xml +++ b/app/src/main/res/layout/activity_cors_config.xml @@ -7,13 +7,6 @@ android:orientation="vertical" tools:context=".CorsConfig"> - - Política CORS Orígenes permitidos Permitidos todos los orígenes - Permitido el uso de endpoint PDF - Uso de endpoint PDF permitido + Uso de endpoint PDF permitido + Uso de endpoint PDF no permitido + Política CORS no encontrada \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 504c8ff..16ce1ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,5 +102,6 @@ Allowed origins All origins allowed PDF Endpoint allowed - PDF Endpoint not allowed + PDF Endpoint not allowed + CORS policy not found \ No newline at end of file