diff --git a/app/build.gradle b/app/build.gradle
index 6c27300..6a179f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "asgardius.page.s3manager"
minSdk 23
targetSdk 33
- versionCode 49
- versionName "0.4.3"
+ versionCode 50
+ versionName "0.4.4"
setProperty("archivesBaseName", "s3-manager-$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java
index b49084d..73d4762 100644
--- a/app/src/main/java/asgardius/page/s3manager/Share.java
+++ b/app/src/main/java/asgardius/page/s3manager/Share.java
@@ -30,9 +30,9 @@ public class Share extends AppCompatActivity {
AWSCredentials myCredentials;
AmazonS3 s3client;
Calendar mycal;
- EditText datepick, monthpick, yearpick, hourpick, minutepick;
- int date, month, year, hour, minute;
- Button share, external;
+ EditText datepick, hourpick, minutepick;
+ int date, hour, minute;
+ Button share;
GeneratePresignedUrlRequest request;
Date expiration;
URL objectURL;
@@ -73,12 +73,9 @@ public class Share extends AppCompatActivity {
setContentView(R.layout.activity_share);
mycal = Calendar.getInstance();
datepick = (EditText)findViewById(R.id.Date);
- monthpick = (EditText)findViewById(R.id.Month);
- yearpick = (EditText)findViewById(R.id.Year);
hourpick = (EditText)findViewById(R.id.Hour);
minutepick = (EditText)findViewById(R.id.Minute);
share = (Button)findViewById(R.id.share);
- external = (Button)findViewById(R.id.open_in);
endpoint = getIntent().getStringExtra("endpoint");
username = getIntent().getStringExtra("username");
password = getIntent().getStringExtra("password");
@@ -106,64 +103,49 @@ public class Share extends AppCompatActivity {
public void onClick(View view) {
//buttonaction
try {
- if (datepick.getText().toString().equals("") || monthpick.getText().toString().equals("") ||
- yearpick.getText().toString().equals("") || hourpick.getText().toString().equals("") ||
- minutepick.getText().toString().equals("")) {
- Toast.makeText(getApplicationContext(),getResources().getString(R.string.null_expiration_date), Toast.LENGTH_SHORT).show();
+ if (datepick.getText().toString().equals("")) {
+ date = 0;
} else {
date = Integer.parseInt(datepick.getText().toString());
- month = Integer.parseInt(monthpick.getText().toString());
- year = Integer.parseInt(yearpick.getText().toString());
- hour = Integer.parseInt(hourpick.getText().toString());
- minute = Integer.parseInt(minutepick.getText().toString());
- mycal.set(Calendar.YEAR, year);
- mycal.set(Calendar.MONTH, month-1);
- mycal.set(Calendar.DATE, date);
- mycal.set(Calendar.HOUR, hour);
- mycal.set(Calendar.MINUTE, minute);
- mycal.set(Calendar.SECOND, 0);
- expiration = mycal.getTime();
- //System.out.println(expiration);
- request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
- objectURL = s3client.generatePresignedUrl(request);
- //System.out.println(URLify(objectURL.toString()));
- Intent shareIntent = new Intent(Intent.ACTION_SEND);
- shareIntent.setType("text/plain");
- shareIntent.putExtra(Intent.EXTRA_TEXT, URLify(objectURL.toString()));
- startActivity(Intent.createChooser(shareIntent, "choose one"));
}
- } catch (Exception e) {
- Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
- }
- }
-
- });
- external.setOnClickListener(new View.OnClickListener(){
- @Override
- public void onClick(View view) {
- //buttonaction
- try {
- if (mediafile) {
- expiration = new Date();
- mycal.setTime(expiration);
- //System.out.println("today is " + mycal.getTime());
- mycal.add(Calendar.HOUR, videotime);
- //System.out.println("Expiration date: " + mycal.getTime());
- expiration = mycal.getTime();
- request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
+ if (hourpick.getText().toString().equals("")) {
+ hour = 0;
} else {
- request = new GeneratePresignedUrlRequest(bucket, object);
+ hour = Integer.parseInt(hourpick.getText().toString());
}
+ if (minutepick.getText().toString().equals("")) {
+ minute = 0;
+ } else {
+ minute = Integer.parseInt(minutepick.getText().toString());
+ }
+ expiration = new Date();
+ System.out.println("today is " + mycal.getTime());
+ mycal.setTime(expiration);
+ if (date == 0 && hour == 0 && minute == 0) {
+ if (mediafile) {
+ mycal.add(Calendar.HOUR, videotime);
+ } else {
+ mycal.add(Calendar.MINUTE, 15);
+ }
+ } else {
+ mycal.add(Calendar.DATE, date);
+ mycal.add(Calendar.HOUR, hour);
+ mycal.add(Calendar.MINUTE, minute);
+ }
+ System.out.println("Expiration date: " + mycal.getTime());
+ expiration = mycal.getTime();
+ //System.out.println(expiration);
+ request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
objectURL = s3client.generatePresignedUrl(request);
//System.out.println(URLify(objectURL.toString()));
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_TEXT, URLify(objectURL.toString()));
startActivity(Intent.createChooser(shareIntent, "choose one"));
- } catch (Exception e) {
- Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
+ } catch (Exception e) {
+ Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
+ }
}
- }
});
}
diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml
index 2ea215b..9ac1c20 100644
--- a/app/src/main/res/layout/activity_account_add.xml
+++ b/app/src/main/res/layout/activity_account_add.xml
@@ -129,17 +129,13 @@
android:id="@+id/addaccount"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:text="@string/accountadd_button"
- android:textColor="?android:attr/colorBackground"
- android:textSize="24sp" />
+ android:text="@string/accountadd_button" />
+ android:text="@string/accounttest_button" />
diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml
index 001fe96..68a5712 100644
--- a/app/src/main/res/layout/activity_cors_config.xml
+++ b/app/src/main/res/layout/activity_cors_config.xml
@@ -28,8 +28,6 @@
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" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2987c2d..76dcb71 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,34 +16,21 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
+ style="?android:attr/buttonStyle" />
-
-
-
-
-
+
+ android:text="@string/save_settings" />
+ android:text="@string/about_button" />
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 85f8a5d..fd636e8 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -19,7 +19,7 @@
@@ -44,48 +44,6 @@
android:textColorHint="?attr/colorOnSecondary"
tools:ignore="MissingConstraints" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:text="@string/file_share"
+ tools:ignore="MissingConstraints" />
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a096f39..bbbd5ac 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,7 +74,7 @@
HH
MM
Fecha de expiración
- Hora de expiración
+ Expira dentro de
Crear enlace al archivo
La fecha de caducidad debe ser inferior a 7 días
Tamaño del archivo
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87eb01b..a5829a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
Object list
Image
Expiration date
- Expiration time
+ Expires within
HH
MM
DD
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
index 456e64c..620b088 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
index c9a540e..2a8d954 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
index b326b9e..73eb1ee 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png
index cc310c1..2279997 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png
index 1c98635..77691f7 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png
index 3d1daea..7c902a4 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png differ