mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

*Dao.kt: change some usages of getString()

Browse source 
Before this change, the getString() method in DatabaseUtils.kt was changed
to allow returning a null value upon method failure. All usages of getString()
were not changed.

This change updates all usages of getString() which require non null return
values. If null is returned, an empty string is used instead.
This commit is contained in:
Jason Whitmore 2025-10-08 20:26:52 -07:00
parent bf36dcb648
commit 5d128d0934
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
View file

@ -144,8 +144,18 @@ class BookmarkItemsDao @Inject constructor(
*/ */
@SuppressLint("Range") @SuppressLint("Range")
fun fromCursor(cursor: Cursor) = with(cursor) { fun fromCursor(cursor: Cursor) = with(cursor) {
var name = getString(COLUMN_NAME)
if (name == null) {
name = ""
}
var id = getString(COLUMN_ID)
if (id == null) {
id = ""
}
DepictedItem( DepictedItem(
getString(COLUMN_NAME), name,
getString(COLUMN_DESCRIPTION), getString(COLUMN_DESCRIPTION),
getString(COLUMN_IMAGE), getString(COLUMN_IMAGE),
getStringArray(COLUMN_INSTANCE_LIST), getStringArray(COLUMN_INSTANCE_LIST),
@ -155,7 +165,7 @@ class BookmarkItemsDao @Inject constructor(
getStringArray(COLUMN_CATEGORIES_THUMBNAIL_LIST) getStringArray(COLUMN_CATEGORIES_THUMBNAIL_LIST)
), ),
getString(COLUMN_IS_SELECTED).toBoolean(), getString(COLUMN_IS_SELECTED).toBoolean(),
getString(COLUMN_ID) id
) )
} }

5
app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
View file

@ -128,7 +128,10 @@ class BookmarkPicturesDao @Inject constructor(
} }
fun fromCursor(cursor: Cursor): Bookmark { fun fromCursor(cursor: Cursor): Bookmark {
val fileName = cursor.getString(COLUMN_MEDIA_NAME) var fileName = cursor.getString(COLUMN_MEDIA_NAME)
if (fileName == null) {
fileName = ""
}
return Bookmark( return Bookmark(
fileName, cursor.getString(COLUMN_CREATOR), uriForName(fileName) fileName, cursor.getString(COLUMN_CREATOR), uriForName(fileName)
) )

18
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.kt
View file

@ -163,11 +163,19 @@ class RecentSearchesDao @Inject constructor(
* @param cursor * @param cursor
* @return RecentSearch object * @return RecentSearch object
*/ */
fun fromCursor(cursor: Cursor): RecentSearch = RecentSearch( fun fromCursor(cursor: Cursor): RecentSearch {
uriForId(cursor.getInt(COLUMN_ID)), var query = cursor.getString(COLUMN_NAME)
cursor.getString(COLUMN_NAME),
Date(cursor.getLong(COLUMN_LAST_USED)) if (query == null) {
) query = ""
}
return RecentSearch(
uriForId(cursor.getInt(COLUMN_ID)),
query,
Date(cursor.getLong(COLUMN_LAST_USED))
)
}
/** /**
* This class contains the database table architechture for recent searches, * This class contains the database table architechture for recent searches,