asgardius/s3manager
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 64 Packages Wiki Activity

wip

Browse source
This commit is contained in:
Page Asgardius 2022-09-15 08:53:46 -07:00
parent e139b841ff
commit 116d6fe7ae
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/asgardius/page/s3manager/Uploader.java
View file

@ -5,10 +5,12 @@ import static android.content.ContentValues.TAG;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.storage.StorageManager;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@ -45,7 +47,7 @@ public class Uploader extends AppCompatActivity {
String username, password, endpoint, bucket, prefix, location, fkey; String username, password, endpoint, bucket, prefix, location, fkey;
boolean isfolder; boolean isfolder;
int progress; int progress;
Uri fileuri, folder; Uri fileuri, folder, uri;
EditText fprefix; EditText fprefix;
Region region; Region region;
S3ClientOptions s3ClientOptions; S3ClientOptions s3ClientOptions;
@ -54,6 +56,8 @@ public class Uploader extends AppCompatActivity {
ProgressBar simpleProgressBar; ProgressBar simpleProgressBar;
long filesize; long filesize;
File ufile; File ufile;
StorageManager sm;
Intent intent;
private static final long MAX_SINGLE_PART_UPLOAD_BYTES = 5 * 1024 * 1024; private static final long MAX_SINGLE_PART_UPLOAD_BYTES = 5 * 1024 * 1024;
@Override @Override
@ -175,11 +179,31 @@ public class Uploader extends AppCompatActivity {
} }
private void performFileSearch(String messageTitle) { private void performFileSearch(String messageTitle) {
Intent intent = new Intent(); if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
intent.setAction(Intent.ACTION_OPEN_DOCUMENT); sm = (StorageManager) this.getSystemService(Context.STORAGE_SERVICE);
intent.addCategory(Intent.CATEGORY_OPENABLE); intent = sm.getPrimaryStorageVolume().createOpenDocumentTreeIntent();
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true); uri = intent.getParcelableExtra("android.provider.extra.INITIAL_URI");
intent.setType("*/*");
String scheme = uri.toString();
Log.d(TAG, "INITIAL_URI scheme: " + scheme);
scheme = scheme.replace("/root/", "/document/");
scheme += "%3A" + "Documents";
uri = Uri.parse(scheme);
intent.putExtra("android.provider.extra.INITIAL_URI", uri);
} else {
intent = new Intent();
intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
intent.setType("*/*");
}
if (intent.resolveActivity(getPackageManager()) != null) { if (intent.resolveActivity(getPackageManager()) != null) {
startActivityForResult(Intent.createChooser(intent, messageTitle), 100); startActivityForResult(Intent.createChooser(intent, messageTitle), 100);
} else { } else {