Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-15 20:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix NPE

Browse source
This commit is contained in:
Eric House 2024-08-28 13:54:27 -07:00
parent 9a86bd075b
commit a8554c22d0
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.kt
View file

@ -472,19 +472,19 @@ class GameListItem(private val m_context: Context, aset: AttributeSet?) :
Log.w(TAG, "interrupted; killing s_thumbThread")
break
}
val activity = elem.m_item.m_activity
val activity = elem.m_item.m_activity!!
val rowid = elem.m_rowid
var thumb = DBUtils.getThumbnail(activity!!, rowid)
var thumb = DBUtils.getThumbnail(activity, rowid)
if (null == thumb) {
// loadMakeBitmap puts in DB
thumb = GameUtils.loadMakeBitmap(activity, rowid)
thumb = GameUtils.loadMakeBitmap(activity, rowid) // here
}
if (null != thumb) {
val fThumb: Bitmap = thumb
thumb?.let {
// val fThumb: Bitmap = thumb
activity.runOnUiThread {
val item = elem.m_item
item.mThumb = fThumb
item.mThumb = it
item.showHide()
}
}

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.kt
View file

@ -427,9 +427,9 @@ object GameUtils {
fun loadMakeBitmap(context: Context, rowid: Long): Bitmap? {
var thumb: Bitmap? = null
GameWrapper.make(context, rowid).use { gw ->
if (null != gw) {
gw?.lock?.let {
thumb = takeSnapshot(context, gw.gamePtr(), gw.gi())
DBUtils.saveThumbnail(context, gw.lock!!, thumb)
DBUtils.saveThumbnail(context, it, thumb)
}
}
return thumb

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.kt
View file

@ -26,9 +26,11 @@ import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.OnLifecycleEvent
import androidx.lifecycle.ProcessLifecycleOwner
import org.eehouse.android.xw4.jni.XwJNI
import java.util.UUID
import org.eehouse.android.xw4.jni.XwJNI
class XWApp : Application(), LifecycleObserver {
override fun onCreate() {
sContext = this