From eddc353a8217f3ccb98f3e5655fe9c5b69c701c3 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sat, 7 Jan 2023 10:16:01 -0700 Subject: [PATCH] code cleanup --- .../asgardius/page/s3manager/AccountAdd.java | 7 ++---- .../asgardius/page/s3manager/Adapter.java | 3 ++- .../page/s3manager/BucketSelect.java | 4 ++-- .../asgardius/page/s3manager/CorsConfig.java | 11 ++++----- .../page/s3manager/CreateBucket.java | 14 +++-------- .../asgardius/page/s3manager/ImageViewer.java | 10 +++----- .../asgardius/page/s3manager/ObjectInfo.java | 11 ++++----- .../page/s3manager/ObjectSelect.java | 24 +++++++++---------- .../java/asgardius/page/s3manager/Share.java | 2 +- .../asgardius/page/s3manager/TextViewer.java | 15 +++--------- .../asgardius/page/s3manager/VideoPlayer.java | 13 +++------- app/src/main/res/values-es/strings.xml | 7 ------ app/src/main/res/values/strings.xml | 7 ------ 13 files changed, 39 insertions(+), 89 deletions(-) diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java index 09de252..c1ff58a 100644 --- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java +++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java @@ -1,9 +1,5 @@ package asgardius.page.s3manager; -import static com.amazonaws.regions.Regions.US_EAST_1; - -import androidx.appcompat.app.AppCompatActivity; - import android.content.Intent; import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; @@ -12,6 +8,8 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.regions.Region; @@ -21,7 +19,6 @@ import com.amazonaws.services.s3.S3ClientOptions; import com.amazonaws.services.s3.model.Bucket; import com.google.android.material.switchmaterial.SwitchMaterial; -import java.util.ArrayList; import java.util.List; public class AccountAdd extends AppCompatActivity { diff --git a/app/src/main/java/asgardius/page/s3manager/Adapter.java b/app/src/main/java/asgardius/page/s3manager/Adapter.java index 4d0e91a..4631f78 100644 --- a/app/src/main/java/asgardius/page/s3manager/Adapter.java +++ b/app/src/main/java/asgardius/page/s3manager/Adapter.java @@ -7,10 +7,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; -import asgardius.page.s3manager.BucketSelect; public class Adapter extends RecyclerView.Adapter{ ArrayList Img, Name; diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java index c66640a..5193453 100644 --- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java @@ -38,7 +38,7 @@ public class BucketSelect extends AppCompatActivity { ArrayList Name; ArrayList Img; RecyclerView recyclerView; - String username, password, endpoint, prefix, location, file, pdfendpoint; + String username, password, endpoint, prefix, location, pdfendpoint; boolean style, isplaylist; Region region; S3ClientOptions s3ClientOptions; @@ -302,7 +302,7 @@ public class BucketSelect extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java index cf7e047..1bb8edc 100644 --- a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java +++ b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java @@ -1,13 +1,13 @@ package asgardius.page.s3manager; -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; +import androidx.appcompat.app.AppCompatActivity; + import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.regions.Region; @@ -16,9 +16,6 @@ import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.S3ClientOptions; import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration; import com.amazonaws.services.s3.model.CORSRule; -import com.amazonaws.services.s3.model.ListObjectsRequest; -import com.amazonaws.services.s3.model.ObjectListing; -import com.amazonaws.services.s3.model.S3ObjectSummary; import java.net.URI; import java.net.URISyntaxException; @@ -66,7 +63,7 @@ public class CorsConfig extends AppCompatActivity { try { s3client = new AmazonS3Client(myCredentials, region); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } s3client.setEndpoint(endpoint); s3ClientOptions.setPathStyleAccess(style); @@ -124,7 +121,7 @@ public class CorsConfig extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java index a6b57c8..926ac67 100644 --- a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java +++ b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java @@ -1,9 +1,6 @@ package asgardius.page.s3manager; -import androidx.appcompat.app.AppCompatActivity; - import android.content.Intent; -import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -11,19 +8,14 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.regions.Region; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.S3ClientOptions; -import com.amazonaws.services.s3.model.DeleteObjectsRequest; -import com.amazonaws.services.s3.model.ListObjectsRequest; -import com.amazonaws.services.s3.model.ObjectListing; -import com.amazonaws.services.s3.model.S3ObjectSummary; - -import java.util.ArrayList; -import java.util.List; public class CreateBucket extends AppCompatActivity { String username, password, endpoint, bucket, location; @@ -89,7 +81,7 @@ public class CreateBucket extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java index 3fdbf14..7b1d4fb 100644 --- a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java +++ b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java @@ -1,22 +1,18 @@ package asgardius.page.s3manager; -import androidx.appcompat.app.AppCompatActivity; - import android.annotation.SuppressLint; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; -import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.otaliastudios.zoom.ZoomImageView; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; -import java.util.stream.Collectors; public class ImageViewer extends AppCompatActivity { String videoURL, title; @@ -71,7 +67,7 @@ public class ImageViewer extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } }); diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java b/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java index 0ecdf68..fb034a8 100644 --- a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java +++ b/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java @@ -1,26 +1,23 @@ package asgardius.page.s3manager; -import androidx.appcompat.app.AppCompatActivity; - import android.os.Bundle; import android.view.View; -import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.regions.Region; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.S3ClientOptions; -import com.amazonaws.services.s3.model.Bucket; import com.amazonaws.services.s3.model.ListObjectsRequest; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3ObjectSummary; -import java.util.ArrayList; import java.util.List; public class ObjectInfo extends AppCompatActivity { @@ -67,7 +64,7 @@ public class ObjectInfo extends AppCompatActivity { try { s3client = new AmazonS3Client(myCredentials, region); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } s3client.setEndpoint(endpoint); s3ClientOptions.setPathStyleAccess(style); @@ -140,7 +137,7 @@ public class ObjectInfo extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java index 4259dde..1f335b2 100644 --- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java @@ -79,7 +79,7 @@ public class ObjectSelect extends AppCompatActivity { try { s3client = new AmazonS3Client(myCredentials, region); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } s3client.setEndpoint(endpoint); s3ClientOptions.setPathStyleAccess(style); @@ -232,7 +232,7 @@ public class ObjectSelect extends AppCompatActivity { Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); - //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } } @@ -253,7 +253,7 @@ public class ObjectSelect extends AppCompatActivity { URL objectURL = s3client.generatePresignedUrl(request); imageViewer(objectURL.toString(), Name.get(position).toString()); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } } /*else if (Img.get(position).equals(R.drawable.textfile)) { //load media file @@ -262,7 +262,7 @@ public class ObjectSelect extends AppCompatActivity { URL objectURL = s3client.generatePresignedUrl(request); textViewer(objectURL.toString()); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }*/ else if (Img.get(position).equals(R.drawable.webpage) || Img.get(position).equals(R.drawable.ptextfile)) { //load media file @@ -271,7 +271,7 @@ public class ObjectSelect extends AppCompatActivity { URL objectURL = s3client.generatePresignedUrl(request); webBrowser(objectURL.toString(), Name.get(position).toString()); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } } else if (Img.get(position).equals(R.drawable.pdffile)) { //load media file @@ -307,10 +307,10 @@ public class ObjectSelect extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); - //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } } @@ -357,10 +357,10 @@ public class ObjectSelect extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); - //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } } @@ -501,7 +501,7 @@ public class ObjectSelect extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); } @@ -679,10 +679,10 @@ public class ObjectSelect extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } }); - //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } } diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java index 8d87a78..4e9c8d0 100644 --- a/app/src/main/java/asgardius/page/s3manager/Share.java +++ b/app/src/main/java/asgardius/page/s3manager/Share.java @@ -109,7 +109,7 @@ public class Share extends AppCompatActivity { try { s3client = new AmazonS3Client(myCredentials, region); } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); } s3client.setEndpoint(endpoint); s3ClientOptions.setPathStyleAccess(style); diff --git a/app/src/main/java/asgardius/page/s3manager/TextViewer.java b/app/src/main/java/asgardius/page/s3manager/TextViewer.java index a189526..9a25383 100644 --- a/app/src/main/java/asgardius/page/s3manager/TextViewer.java +++ b/app/src/main/java/asgardius/page/s3manager/TextViewer.java @@ -1,7 +1,5 @@ package asgardius.page.s3manager; -import androidx.appcompat.app.AppCompatActivity; - import android.os.Build; import android.os.Bundle; import android.view.View; @@ -9,18 +7,11 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.Toast; -import com.amazonaws.services.s3.model.ListObjectsRequest; -import com.amazonaws.services.s3.model.ObjectListing; -import com.amazonaws.services.s3.model.S3ObjectSummary; +import androidx.appcompat.app.AppCompatActivity; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; import java.util.stream.Collectors; public class TextViewer extends AppCompatActivity { @@ -66,11 +57,11 @@ public class TextViewer extends AppCompatActivity { @Override public void run() { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } }); - //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show(); finish(); } } diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java index 93f28d5..0a7c8a4 100644 --- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java @@ -35,7 +35,6 @@ import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.ui.PlayerNotificationManager; import com.google.android.exoplayer2.ui.StyledPlayerView; import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; -import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor; import com.google.android.exoplayer2.upstream.cache.SimpleCache; @@ -195,15 +194,9 @@ public class VideoPlayer extends AppCompatActivity { if(success) { player.pause(); } else { - if (cause instanceof HttpDataSource.HttpDataSourceException) { - // An HTTP error occurred. - //System.out.println("Playback error F"); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.media_conn_fail), Toast.LENGTH_SHORT).show(); - } else { - // An HTTP error occurred. - //System.out.println("Playback error F"); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.media_wrong_type), Toast.LENGTH_SHORT).show(); - } + // An HTTP error occurred. + //System.out.println("Playback error F"); + Toast.makeText(getApplicationContext(), Objects.requireNonNull(error.getCause()).toString(), Toast.LENGTH_SHORT).show(); player.release(); finish(); } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5002e24..0a8ab9c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -62,15 +62,8 @@ Cuenta editada exitosamente No se permiten las conexiones sin SSL La URL del endpoint debe iniciar con https:// - Probar explorador de archivos Tipo de archivo no soportado - Conectar al servidor de pruebas - No se pudo obtener el archivo remoto - Archivo multimedia inválido - No se pudo conectar al servidor Acerca de esta app - Botón de prueba - Contenido de prueba servidor pdfjs Necesita configurar un servidor pdf.js D diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a209f2..9f30a48 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,15 +87,8 @@ Account edited successfully Connections without SSL are not allowed Endpoint URL must start with https:// - File Explorer Test Unsupported file type - Connect to test server - Cannot retrieve remote file - Invalid media file - Cannot connect to server About this app - Dummy Button - DUMMY\nCONTENT Settings Save settings Max media cache size (in MiB)