diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index ab03e24..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8b16708..fc0ebd9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 108733c..2623df3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,9 @@
package="asgardius.page.s3manager">
-
+
+
= 1) {
Toast.makeText(ObjectSelect.this, getResources().getString(R.string.only_item_onlist), Toast.LENGTH_SHORT).show();
} else {
@@ -270,7 +272,9 @@ public class ObjectSelect extends AppCompatActivity {
public boolean onMenuItemClick(MenuItem menuItem) {
// Toast message on menu item clicked
//Toast.makeText(MainActivity.this, "You Clicked " + menuItem.getTitle(), Toast.LENGTH_SHORT).show();
- if (menuItem.getTitle() == getResources().getString(R.string.file_external)) {
+ if (menuItem.getTitle() == getResources().getString(R.string.upload_here)) {
+ upload(Name.get(position).toString());
+ } else if (menuItem.getTitle() == getResources().getString(R.string.file_external)) {
GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
URL objectURL = s3client.generatePresignedUrl(request);
share(objectURL.toString());
@@ -447,4 +451,15 @@ public class ObjectSelect extends AppCompatActivity {
AlertDialog dialog = builder.create();
dialog.show();
}
+
+ private void upload(String object) {
+ Intent intent = new Intent(this, Uploader.class);
+ intent.putExtra("endpoint", endpoint);
+ intent.putExtra("username", username);
+ intent.putExtra("password", password);
+ intent.putExtra("bucket", bucket);
+ intent.putExtra("prefix", prefix + object);
+ intent.putExtra("region", location);
+ startActivity(intent);
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3manager/Uploader.java
new file mode 100644
index 0000000..31b2f76
--- /dev/null
+++ b/app/src/main/java/asgardius/page/s3manager/Uploader.java
@@ -0,0 +1,32 @@
+package asgardius.page.s3manager;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+public class Uploader extends AppCompatActivity {
+ String file, username, password, endpoint, bucket, prefix, location;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_uploader);
+ endpoint = getIntent().getStringExtra("endpoint");
+ username = getIntent().getStringExtra("username");
+ password = getIntent().getStringExtra("password");
+ bucket = getIntent().getStringExtra("bucket");
+ location = getIntent().getStringExtra("region");
+ prefix = getIntent().getStringExtra("prefix");
+ Toast.makeText(Uploader.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
+ file = upload().getData() != null ? upload().getData().toString() : null;
+ }
+
+ private Intent upload() {
+ Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+ intent.setType("*/*");
+ startActivityForResult(intent, 100);
+ return intent;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 56c52a5..0e28020 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="@string/test_server_button"
+ android:text="@string/dummy_button"
tools:ignore="MissingConstraints"
style="?android:attr/buttonStyle" />
diff --git a/app/src/main/res/layout/activity_uploader.xml b/app/src/main/res/layout/activity_uploader.xml
new file mode 100644
index 0000000..77bdfee
--- /dev/null
+++ b/app/src/main/res/layout/activity_uploader.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/bucket_menu.xml b/app/src/main/res/menu/bucket_menu.xml
index 29a5c71..4b9dc8f 100644
--- a/app/src/main/res/menu/bucket_menu.xml
+++ b/app/src/main/res/menu/bucket_menu.xml
@@ -3,7 +3,7 @@
+ android:title="@string/upload_tobucket" />
-