Skip to content

Improve Tester module #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2018
Merged

Improve Tester module #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
036d7ed
Use short for a Activity's request code
scana Nov 28, 2018
142560b
Switch to new FilestackPicker API in tester module
scana Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion filestack/src/main/java/com/filestack/android/FilestackPicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static List<Selection> getSelectedFiles(Intent data) {
return data.getParcelableArrayListExtra(FsConstants.EXTRA_SELECTION_LIST);
}

private static final int FILESTACK_REQUEST_CODE = 20181130;
private static final short FILESTACK_REQUEST_CODE = 662;

private final Config config;
private final StorageOptions storageOptions;
Expand Down
36 changes: 14 additions & 22 deletions tester/src/main/java/com/filestack/android/demo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.widget.Toast;

import com.filestack.Config;
import com.filestack.android.FilestackPicker;
import com.filestack.android.FsActivity;
import com.filestack.android.FsConstants;
import com.filestack.android.Selection;
Expand All @@ -25,6 +26,7 @@
import java.sql.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Set;
Expand All @@ -51,17 +53,13 @@ protected void onCreate(Bundle savedInstanceState) {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Locale locale = Locale.getDefault();

super.onActivityResult(requestCode, resultCode, data);

if (requestCode == REQUEST_FILESTACK && resultCode == RESULT_OK) {
if (FilestackPicker.canReadResult(requestCode, resultCode)) {
Log.i(TAG, "received filestack selections");
String key = FsConstants.EXTRA_SELECTION_LIST;
ArrayList<Selection> selections = data.getParcelableArrayListExtra(key);
List<Selection> selections = FilestackPicker.getSelectedFiles(data);
for (int i = 0; i < selections.size(); i++) {
Selection selection = selections.get(i);
String msg = String.format(locale, "selection %d: %s", i, selection.getName());
String msg = String.format(Locale.ROOT, "selection %d: %s", i, selection.getName());
Log.i(TAG, msg);
}
}
Expand All @@ -73,18 +71,9 @@ public void settings(View view) {
}

public void launch(View view) {
Intent intent = new Intent(this, FsActivity.class);
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);

Set<String> sources = sharedPref.getStringSet("upload_sources", null);
intent.putExtra(FsConstants.EXTRA_SOURCES, new ArrayList<>(sources));

boolean autoUpload = sharedPref.getBoolean("auto_upload", false);
intent.putExtra(FsConstants.EXTRA_AUTO_UPLOAD, autoUpload);

String mimeFilter = sharedPref.getString("mime_filter", null);
String[] mimeTypes = mimeFilter.split(",");
intent.putExtra(FsConstants.EXTRA_MIME_TYPES, mimeTypes);
List<String> mimeTypes = Arrays.asList(mimeFilter.split(","));

String apiKey = sharedPref.getString("api_key", null);
String policy = sharedPref.getString("policy", null);
Expand All @@ -96,11 +85,14 @@ public void launch(View view) {
}

Config config = new Config(apiKey, getString(R.string.return_url), policy, signature);
intent.putExtra(FsConstants.EXTRA_CONFIG, config);

boolean allowMultipleFiles = sharedPref.getBoolean("allow_multiple_files", true);
intent.putExtra(FsConstants.EXTRA_ALLOW_MULTIPLE_FILES, allowMultipleFiles);

startActivityForResult(intent, REQUEST_FILESTACK);
FilestackPicker picker = new FilestackPicker.Builder()
.config(config)
.sources(new ArrayList<>(sharedPref.getStringSet("upload_sources", Collections.<String>emptySet())))
.autoUploadEnabled(sharedPref.getBoolean("auto_upload", false))
.mimeTypes(mimeTypes)
.multipleFilesSelectionEnabled(sharedPref.getBoolean("allow_multiple_files", true))
.build();
picker.launch(this);
}
}