Skip to content
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

Jump to bottom

[image_picker] Migrate Android to Pigeon #3476

Merged
merged 6 commits into from
Mar 16, 2023
Merged

[image_picker] Migrate Android to Pigeon #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
755e29d
Update Dart implementation and tests
stuartmorgan Mar 13, 2023
2c03830
Switch to consolidated multi-path calls to simplify native
stuartmorgan Mar 13, 2023
28408e9
Update Java implementation.
stuartmorgan Mar 13, 2023
058dd70
Update Pigeon
stuartmorgan Mar 16, 2023
3ce6474
Version bump
stuartmorgan Mar 16, 2023
702015e
Merge branch 'main' into image-picker-android-pigeon
stuartmorgan Mar 16, 2023
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
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.6+3

* Switches to Pigeon for internal implementation.

## 0.8.6+2

* Fixes null pointer exception in `saveResult`.
Expand Down
29 changes: 0 additions & 29 deletions ...cker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImageOutputOptions.java
View file
Open in desktop

This file was deleted.

54 changes: 27 additions & 27 deletions ...picker_android/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ public enum CacheType {
VIDEO
}

static final String MAP_KEY_PATH = "path";
static final String MAP_KEY_PATH_LIST = "pathList";
static final String MAP_KEY_MAX_WIDTH = "maxWidth";
static final String MAP_KEY_MAX_HEIGHT = "maxHeight";
static final String MAP_KEY_IMAGE_QUALITY = "imageQuality";
private static final String MAP_KEY_TYPE = "type";
private static final String MAP_KEY_ERROR_CODE = "errorCode";
private static final String MAP_KEY_ERROR_MESSAGE = "errorMessage";
static final String MAP_KEY_TYPE = "type";
static final String MAP_KEY_ERROR = "error";

private static final String MAP_TYPE_VALUE_IMAGE = "image";
private static final String MAP_TYPE_VALUE_VIDEO = "video";

private static final String FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY =
"flutter_image_picker_image_path";
Expand All @@ -50,7 +51,7 @@ public enum CacheType {
@VisibleForTesting
static final String SHARED_PREFERENCES_NAME = "flutter_image_picker_shared_preference";

private SharedPreferences prefs;
private final SharedPreferences prefs;

ImagePickerCache(Context context) {
prefs = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
Expand All @@ -59,10 +60,10 @@ public enum CacheType {
void saveType(CacheType type) {
switch (type) {
case IMAGE:
setType("image");
setType(MAP_TYPE_VALUE_IMAGE);
break;
case VIDEO:
setType("video");
setType(MAP_TYPE_VALUE_VIDEO);
break;
}
}
Expand All @@ -71,16 +72,17 @@ private void setType(String type) {
prefs.edit().putString(SHARED_PREFERENCE_TYPE_KEY, type).apply();
}

void saveDimensionWithOutputOptions(ImageOutputOptions options) {
void saveDimensionWithOutputOptions(Messages.ImageSelectionOptions options) {
SharedPreferences.Editor editor = prefs.edit();
if (options.maxWidth != null) {
editor.putLong(SHARED_PREFERENCE_MAX_WIDTH_KEY, Double.doubleToRawLongBits(options.maxWidth));
if (options.getMaxWidth() != null) {
editor.putLong(
SHARED_PREFERENCE_MAX_WIDTH_KEY, Double.doubleToRawLongBits(options.getMaxWidth()));
}
if (options.maxHeight != null) {
if (options.getMaxHeight() != null) {
editor.putLong(
SHARED_PREFERENCE_MAX_HEIGHT_KEY, Double.doubleToRawLongBits(options.maxHeight));
SHARED_PREFERENCE_MAX_HEIGHT_KEY, Double.doubleToRawLongBits(options.getMaxHeight()));
}
editor.putInt(SHARED_PREFERENCE_IMAGE_QUALITY_KEY, options.quality);
editor.putInt(SHARED_PREFERENCE_IMAGE_QUALITY_KEY, options.getQuality().intValue());
editor.apply();
}

Expand Down Expand Up @@ -115,35 +117,37 @@ void clear() {
}

Map<String, Object> getCacheMap() {

Map<String, Object> resultMap = new HashMap<>();
ArrayList<String> pathList = new ArrayList<>();
boolean hasData = false;

if (prefs.contains(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY)) {
final Set<String> imagePathList =
prefs.getStringSet(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, null);
if (imagePathList != null) {
pathList.addAll(imagePathList);
ArrayList<String> pathList = new ArrayList<>(imagePathList);
resultMap.put(MAP_KEY_PATH_LIST, pathList);
hasData = true;
}
}

if (prefs.contains(SHARED_PREFERENCE_ERROR_CODE_KEY)) {
final String errorCodeValue = prefs.getString(SHARED_PREFERENCE_ERROR_CODE_KEY, "");
resultMap.put(MAP_KEY_ERROR_CODE, errorCodeValue);
final Messages.CacheRetrievalError.Builder error = new Messages.CacheRetrievalError.Builder();
error.setCode(prefs.getString(SHARED_PREFERENCE_ERROR_CODE_KEY, ""));
hasData = true;
if (prefs.contains(SHARED_PREFERENCE_ERROR_MESSAGE_KEY)) {
final String errorMessageValue = prefs.getString(SHARED_PREFERENCE_ERROR_MESSAGE_KEY, "");
resultMap.put(MAP_KEY_ERROR_MESSAGE, errorMessageValue);
error.setMessage(prefs.getString(SHARED_PREFERENCE_ERROR_MESSAGE_KEY, ""));
}
resultMap.put(MAP_KEY_ERROR, error.build());
}

if (hasData) {
if (prefs.contains(SHARED_PREFERENCE_TYPE_KEY)) {
final String typeValue = prefs.getString(SHARED_PREFERENCE_TYPE_KEY, "");
resultMap.put(MAP_KEY_TYPE, typeValue);
resultMap.put(
MAP_KEY_TYPE,
typeValue.equals(MAP_TYPE_VALUE_VIDEO)
? Messages.CacheRetrievalType.VIDEO
: Messages.CacheRetrievalType.IMAGE);
}
if (prefs.contains(SHARED_PREFERENCE_MAX_WIDTH_KEY)) {
final long maxWidthValue = prefs.getLong(SHARED_PREFERENCE_MAX_WIDTH_KEY, 0);
Expand All @@ -153,12 +157,8 @@ Map<String, Object> getCacheMap() {
final long maxHeightValue = prefs.getLong(SHARED_PREFERENCE_MAX_HEIGHT_KEY, 0);
resultMap.put(MAP_KEY_MAX_HEIGHT, Double.longBitsToDouble(maxHeightValue));
}
if (prefs.contains(SHARED_PREFERENCE_IMAGE_QUALITY_KEY)) {
final int imageQuality = prefs.getInt(SHARED_PREFERENCE_IMAGE_QUALITY_KEY, 100);
resultMap.put(MAP_KEY_IMAGE_QUALITY, imageQuality);
} else {
resultMap.put(MAP_KEY_IMAGE_QUALITY, 100);
}
final int imageQuality = prefs.getInt(SHARED_PREFERENCE_IMAGE_QUALITY_KEY, 100);
resultMap.put(MAP_KEY_IMAGE_QUALITY, imageQuality);
}
return resultMap;
}
Expand Down
Loading