diff --git a/app/build.gradle b/app/build.gradle
index 268aa3e..69f1e4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "asgardius.page.s3manager"
minSdk 23
targetSdk 33
- versionCode 66
- versionName "0.7.5"
+ versionCode 67
+ versionName "0.7.6"
setProperty("archivesBaseName", "s3-manager-$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 5193453..2283dee 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import android.app.Activity;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
@@ -357,7 +358,8 @@ public class BucketSelect extends AppCompatActivity {
intent.putExtra("password", password);
intent.putExtra("region", location);
intent.putExtra("style", style);
- startActivity(intent);
+ //startActivity(intent);
+ ((Activity) this).startActivityForResult(intent, 25);
}
private void download(String bucket) {
@@ -394,4 +396,15 @@ public class BucketSelect extends AppCompatActivity {
Toast.makeText(getApplicationContext(),getResources().getString(R.string.copy_ok), Toast.LENGTH_SHORT).show();
}
}
+
+ public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
+ // The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
+ // If the request code seen here doesn't match, it's the response to some other intent,
+ // and the below code shouldn't run at all.
+ super.onActivityResult(requestCode, resultCode, resultData);
+ if(requestCode == 25 && resultCode == 25) {
+ recreate();
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
index 926ac67..d8c7831 100644
--- a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
+++ b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
@@ -67,8 +67,10 @@ public class CreateBucket extends AppCompatActivity {
@Override
public void run() {
// Sending reference and data to Adapter
+ setResult(25);
Toast.makeText(getApplicationContext(),getResources().getString(R.string.create_bucket_success), Toast.LENGTH_SHORT).show();
- mainmenu();
+ finish();
+ //mainmenu();
}
});
@@ -98,12 +100,12 @@ public class CreateBucket extends AppCompatActivity {
}
- private void mainmenu() {
+ /*private void mainmenu() {
Intent intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra("EXIT", true);
startActivity(intent);
- }
+ }*/
}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/Downloader.java b/app/src/main/java/asgardius/page/s3manager/Downloader.java
index cbb6fa4..ea6aa21 100644
--- a/app/src/main/java/asgardius/page/s3manager/Downloader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Downloader.java
@@ -288,6 +288,19 @@ public class Downloader extends AppCompatActivity {
}
@Override
+
+ public void onDestroy() {
+ if (!mWifiLock.isHeld()) {
+ mWifiLock.acquire();
+ //System.out.println("WifiLock acquired");
+ }
+ if (!mWakeLock.isHeld()) {
+ mWakeLock.acquire();
+ //System.out.println("WakeLock acquired");
+ }
+ super.onDestroy();
+ }
+
public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
// The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
// If the request code seen here doesn't match, it's the response to some other intent,
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3manager/Uploader.java
index 1aa9af8..1e11899 100644
--- a/app/src/main/java/asgardius/page/s3manager/Uploader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Uploader.java
@@ -351,6 +351,19 @@ public class Uploader extends AppCompatActivity {
@SuppressLint("SetTextI18n")
@Override
+
+ public void onDestroy() {
+ if (!mWifiLock.isHeld()) {
+ mWifiLock.acquire();
+ //System.out.println("WifiLock acquired");
+ }
+ if (!mWakeLock.isHeld()) {
+ mWakeLock.acquire();
+ //System.out.println("WakeLock acquired");
+ }
+ super.onDestroy();
+ }
+
public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
// The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
// If the request code seen here doesn't match, it's the response to some other intent,
diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
index 3622bd4..82187dd 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
@@ -323,6 +323,14 @@ public class VideoPlayer extends AppCompatActivity {
@Override
public void onDestroy() {
+ if (!mWifiLock.isHeld()) {
+ mWifiLock.acquire();
+ //System.out.println("WifiLock acquired");
+ }
+ if (!mWakeLock.isHeld()) {
+ mWakeLock.acquire();
+ //System.out.println("WakeLock acquired");
+ }
mediaSessionConnector.setPlayer(null);
deleteCache(this, standaloneDatabaseProvider);
mediaSession.setActive(false);
diff --git a/app/src/main/res/layout/activity_create_bucket.xml b/app/src/main/res/layout/activity_create_bucket.xml
index 7c7843b..701c67f 100644
--- a/app/src/main/res/layout/activity_create_bucket.xml
+++ b/app/src/main/res/layout/activity_create_bucket.xml
@@ -1,5 +1,5 @@
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/67.txt b/fastlane/metadata/android/en-US/changelogs/67.txt
new file mode 100644
index 0000000..bc2355a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/67.txt
@@ -0,0 +1 @@
+* UI fixes
\ No newline at end of file