TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Localize 'camera' folder title.

Browse Source
This commit is contained in:
Alex Hart 2020-10-27 10:47:48 -03:00 committed by Greyson Parrelli
parent 07952f2146
commit dfc4178252
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
View File

@ -42,6 +42,7 @@ import java.util.Map;
public class MediaRepository { public class MediaRepository {
private static final String TAG = Log.tag(MediaRepository.class); private static final String TAG = Log.tag(MediaRepository.class);
private static final String CAMERA = "Camera";
/** /**
* Retrieves a list of folders that contain media. * Retrieves a list of folders that contain media.
@ -169,12 +170,12 @@ public class MediaRepository {
String bucketId = cursor.getString(cursor.getColumnIndexOrThrow(projection[1])); String bucketId = cursor.getString(cursor.getColumnIndexOrThrow(projection[1]));
String title = cursor.getString(cursor.getColumnIndexOrThrow(projection[2])); String title = cursor.getString(cursor.getColumnIndexOrThrow(projection[2]));
long timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(projection[3])); long timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(projection[3]));
FolderData folder = Util.getOrDefault(folders, bucketId, new FolderData(thumbnail, title, bucketId)); FolderData folder = Util.getOrDefault(folders, bucketId, new FolderData(thumbnail, localizeTitle(context, title), bucketId));
folder.incrementCount(); folder.incrementCount();
folders.put(bucketId, folder); folders.put(bucketId, folder);
if (cameraBucketId == null && "Camera".equals(title)) { if (cameraBucketId == null && CAMERA.equals(title)) {
cameraBucketId = bucketId; cameraBucketId = bucketId;
} }
@ -188,6 +189,14 @@ public class MediaRepository {
return new FolderResult(cameraBucketId, globalThumbnail, thumbnailTimestamp, folders); return new FolderResult(cameraBucketId, globalThumbnail, thumbnailTimestamp, folders);
} }
private @NonNull String localizeTitle(@NonNull Context context, @NonNull String title) {
if (CAMERA.equals(title)) {
return context.getString(R.string.MediaRepository__camera);
} else {
return title;
}
}
@WorkerThread @WorkerThread
private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId) { private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId) {
List<Media> images = getMediaInBucket(context, bucketId, Images.Media.EXTERNAL_CONTENT_URI, true); List<Media> images = getMediaInBucket(context, bucketId, Images.Media.EXTERNAL_CONTENT_URI, true);

1
app/src/main/res/values/strings.xml
View File

@ -930,6 +930,7 @@
<!-- MediaRepository --> <!-- MediaRepository -->
<string name="MediaRepository_all_media">All media</string> <string name="MediaRepository_all_media">All media</string>
<string name="MediaRepository__camera">Camera</string>
<!-- MessageRecord --> <!-- MessageRecord -->
<string name="MessageRecord_unknown">Unknown</string> <string name="MessageRecord_unknown">Unknown</string>