Skip to content

Searching and Sorting Fix along with name to root folder #2928

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
wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Searching and Sorting Fix along with name to root folder #2928

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4435c96
Fixed Image Delete Issue , TrashBin Issue and More
satyajiit Nov 17, 2019
1cfbced
Merge branch 'development' into NullFix
satyajiit Nov 20, 2019
45bb359
Merge branch 'development' into NullFix
satyajiit Dec 2, 2019
2ace0bd
Merge branch 'development' into NullFix
satyajiit Feb 2, 2020
810b50a
Merge branch 'development' into NullFix
satyajiit Oct 12, 2020
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
5 changes: 4 additions & 1 deletion app/src/main/java/org/fossasia/phimpme/gallery/data/providers/MediaStoreProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import org.fossasia.phimpme.R;
import org.fossasia.phimpme.gallery.data.Album;
import org.fossasia.phimpme.gallery.data.CustomAlbumsHelper;
import org.fossasia.phimpme.gallery.data.Media;
Expand Down Expand Up @@ -119,7 +120,9 @@ public static ArrayList<Album> getAlbums(Context context) {
context,
path,
cur.getLong(idColumn),
cur.getString(nameColumn),
cur.getString(nameColumn) == null
? context.getString(R.string.sd_card_root_name)
: cur.getString(nameColumn),
getAlbumCount(context, cur.getLong(idColumn)));
if (album.addMedia(getLastMedia(context, album.getId()))) list.add(album);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,6 +1389,7 @@
<string name="text_plain">text/plain</string>
<string name="market">market://details?id=</string>
<string name="playstore">https://play.google.com/store/apps/details?id=</string>
<string name="sd_card_root_name">SdCard</string>
<string name="twitter_phimpme">phimpme</string>
<string name="facebook_phimpme">phimpmeapp</string>
</resources>