Skip to content

[Feat/Fix] (Fix/Feat IOS Hidden SubDirectories pictures) (Fix TIFF AND HEIC is not implemented) (Feat add counter in Collections) #21

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

Open
jguyet wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[Feat/Fix] (Fix/Feat IOS Hidden SubDirectories pictures) (Fix TIFF AND HEIC is not implemented) (Feat add counter in Collections) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7faeb24
fix getting all photos
jguyet Apr 5, 2020
6667931
add counts
jguyet Apr 5, 2020
3a6897b
fix ios counts
jguyet Apr 5, 2020
c825493
fix count of assets in collections, remove hidden albums
jguyet Apr 12, 2020
3386ef8
retrieve top of repertorie albums ios
jguyet Apr 12, 2020
d67258f
wip comments
jguyet May 6, 2020
051f89e
wip
jguyet May 6, 2020
1f2f5fa
Only get JPEGRepresentation from image getting
jguyet May 10, 2020
1d8d09c
ios fix warns
jguyet May 10, 2020
da2ae05
Optimisation, stop after limit photos
jguyet May 10, 2020
e478a4c
reorientation of image
jguyet May 11, 2020
74a673e
fix changing Width/Height orientation
jguyet May 11, 2020
4c55476
wip
jguyet May 11, 2020
bacc380
Remove DISTINCT for working in android 10
jguyet Mar 21, 2021
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
22 changes: 18 additions & 4 deletions src/android/Photos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public class Photos extends CordovaPlugin {
private static final String P_DATE = "date";
private static final String P_TS = "timestamp";
private static final String P_TYPE = "contentType";
private static final String P_COUNT = "count";

private static final String P_SIZE = "dimension";
private static final String P_QUALITY = "quality";
Expand Down Expand Up @@ -108,7 +109,7 @@ public class Photos extends CordovaPlugin {

@SuppressWarnings("MismatchedReadAndWriteOfArray")
private static final String[] PRJ_COLLECTIONS =
new String[]{"DISTINCT " + BUCKET_ID, BUCKET_DISPLAY_NAME};
new String[]{BUCKET_ID, BUCKET_DISPLAY_NAME, SIZE};

@SuppressWarnings("MismatchedReadAndWriteOfArray")
private static final String[] PRJ_PHOTOS =
Expand Down Expand Up @@ -221,7 +222,20 @@ private void collections(final JSONObject options, final CallbackContext callbac
final JSONObject item = new JSONObject();
item.put(P_ID, cursor.getString(cursor.getColumnIndex(BUCKET_ID)));
item.put(P_NAME, cursor.getString(cursor.getColumnIndex(BUCKET_DISPLAY_NAME)));
result.put(item);
item.put(P_COUNT, "1");

JSONObject element = null;
for (int i = 0; i < result.length(); i++) {
if (result.getJSONObject(i).getString(P_ID).equalsIgnoreCase(item.getString(P_ID))){
element = result.getJSONObject(i);
break;
}
}
if (element == null) {
result.put(item);
} else {
element.put(P_COUNT, Integer.parseInt(element.getString(P_COUNT)) + 1);
}
} while (cursor.moveToNext());
}
callbackContext.success(result);
Expand All @@ -244,8 +258,8 @@ private void photos(final JSONArray collectionIds, final JSONObject options, fin
selection = BUCKET_ID + " IN (" + repeatText(collectionIds.length(), "?", ",") + ")";
selectionArgs = this.<String>jsonArrayToList(collectionIds).toArray(new String[collectionIds.length()]);
} else {
selection = BUCKET_DISPLAY_NAME + "=?";
selectionArgs = new String[]{BN_CAMERA};
selection = null;
selectionArgs = null;
}

final int offset = options != null ? options.optInt(P_LIST_OFFSET, 0) : 0;
Expand Down
Loading