From b2de50b544a69e3b900cb4065683e128003b9055 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Mon, 26 Dec 2022 08:13:13 -0700
Subject: [PATCH] buttons

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../asgardius/page/s3manager/CorsConfig.java  | 14 +++++-
 .../asgardius/page/s3manager/Settings.java    |  5 +-
 .../main/res/layout/activity_cors_config.xml  | 27 +++++++++++
 app/src/main/res/layout/content_settings.xml  | 46 -------------------
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 7 files changed, 50 insertions(+), 49 deletions(-)
 delete mode 100644 app/src/main/res/layout/content_settings.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e978e3..fa500ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
         tools:targetApi="31">
         <activity
             android:name=".CorsConfig"
+            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
diff --git a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
index 915f3dd..3016e2d 100644
--- a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
+++ b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -34,6 +35,7 @@ public class CorsConfig extends AppCompatActivity {
     boolean style;
     boolean allorigins, pdfcompatible, found = false;
     TextView origins;
+    Button allowall, allowpdf, deletecors;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -46,6 +48,9 @@ public class CorsConfig extends AppCompatActivity {
         bucket = getIntent().getStringExtra("bucket");
         style = getIntent().getBooleanExtra("style", false);
         location = getIntent().getStringExtra("region");
+        allowall = (Button)findViewById(R.id.allow_all);
+        allowpdf = (Button)findViewById(R.id.allow_pdf);
+        deletecors = (Button)findViewById(R.id.delete_cors);
         try {
             pdfendpoint = new URI(getIntent().getStringExtra("pdfendpoint"));
         } catch (URISyntaxException e) {
@@ -80,7 +85,7 @@ public class CorsConfig extends AppCompatActivity {
                                 System.out.println("AllowedMethod: "+rule.getAllowedMethods());
                                 if (rule.getAllowedOrigins().toString().equals("[*]")) {
                                     allorigins = true;
-                                } else if (rule.getAllowedOrigins().toString().equals("[https://"+pdfendpoint.getHost()+"]")) {
+                                } else if (rule.getAllowedOrigins().toString().contains("https://"+pdfendpoint.getHost())) {
                                     pdfcompatible = true;
                                 }
                             }
@@ -93,12 +98,19 @@ public class CorsConfig extends AppCompatActivity {
                         public void run() {
                             if (allorigins) {
                                 origins.setText(getResources().getString(R.string.cors_all));
+                                deletecors.setVisibility(View.VISIBLE);
                             } else if (pdfcompatible) {
                                 origins.setText(getResources().getString(R.string.cors_pdf));
+                                deletecors.setVisibility(View.VISIBLE);
+                                allowall.setVisibility(View.VISIBLE);
                             } else if (found) {
                                 origins.setText(getResources().getString(R.string.cors_npdf));
+                                deletecors.setVisibility(View.VISIBLE);
+                                allowall.setVisibility(View.VISIBLE);
                             } else {
                                 origins.setText(getResources().getString(R.string.cors_none));
+                                allowall.setVisibility(View.VISIBLE);
+                                allowpdf.setVisibility(View.VISIBLE);
                             }
                         }
                     });
diff --git a/app/src/main/java/asgardius/page/s3manager/Settings.java b/app/src/main/java/asgardius/page/s3manager/Settings.java
index 0c7f1ce..6ac8f05 100644
--- a/app/src/main/java/asgardius/page/s3manager/Settings.java
+++ b/app/src/main/java/asgardius/page/s3manager/Settings.java
@@ -22,6 +22,7 @@ public class Settings extends AppCompatActivity {
     SQLiteDatabase db;
     String videocache, videotime, buffersize;
     EditText vcachepick, vtimepick, bsizepick;
+    Button saveprefs, about;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,7 +85,7 @@ public class Settings extends AppCompatActivity {
         getprefs.start();
 
         //This is to add new user account
-        Button saveprefs = (Button)findViewById(R.id.saveprefs);
+        saveprefs = (Button)findViewById(R.id.saveprefs);
         saveprefs.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
@@ -119,7 +120,7 @@ public class Settings extends AppCompatActivity {
         });
 
         //This is to view app credits
-        Button about = (Button)findViewById(R.id.settings_button);
+        about = (Button)findViewById(R.id.settings_button);
         about.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml
index 5e46028..f7c4f2f 100644
--- a/app/src/main/res/layout/activity_cors_config.xml
+++ b/app/src/main/res/layout/activity_cors_config.xml
@@ -14,4 +14,31 @@
         android:textAlignment="center"
         android:textSize="25sp" />
 
+    <Button
+        android:id="@+id/allow_all"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:text="@string/allow_all"
+        android:textColor="?android:attr/colorBackground"
+        android:textSize="24sp"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/allow_pdf"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:text="@string/allow_pdf"
+        android:textColor="?android:attr/colorBackground"
+        android:textSize="24sp"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/delete_cors"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:text="@string/delete_cors"
+        android:textColor="?android:attr/colorBackground"
+        android:textSize="24sp"
+        android:visibility="gone" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml
deleted file mode 100644
index 79a1dee..0000000
--- a/app/src/main/res/layout/content_settings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".Settings"
-    tools:showIn="@layout/activity_settings">
-
-    <LinearLayout
-        android:id="@+id/linearLayoutSubmit"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/expiration_date"
-            android:textAlignment="center"
-            android:textSize="25sp" />
-
-        <Button
-            android:id="@+id/saveprefs"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/accountadd_button"
-            tools:ignore="MissingConstraints"
-            style="?android:attr/buttonStyle" />
-
-        <Button
-            android:id="@+id/settings_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/about_button"
-            tools:ignore="MissingConstraints"
-            style="?android:attr/buttonStyle" />
-
-    </LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 41bc1f8..56bf0e5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -101,4 +101,7 @@
     <string name="cors_pdf">Uso de endpoint PDF permitido</string>
     <string name="cors_npdf">Uso de endpoint PDF no permitido</string>
     <string name="cors_none">Política CORS no encontrada</string>
+    <string name="allow_all">Permitir todo</string>
+    <string name="allow_pdf">Permitir pdf</string>
+    <string name="delete_cors">Eliminar CORS</string>
 </resources>
\ 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 16ce1ab..f616bcb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,4 +104,7 @@
     <string name="cors_pdf">PDF Endpoint allowed</string>
     <string name="cors_npdf">PDF Endpoint not allowed</string>
     <string name="cors_none">CORS policy not found</string>
+    <string name="allow_all">Allow all</string>
+    <string name="allow_pdf">Allow pdf</string>
+    <string name="delete_cors">Delete CORS</string>
 </resources>
\ No newline at end of file