Fix UninitializedPropertyAccessException caused by accessing imageAdapter

FishBun/src/main/java/com/sangcomz/fishbun/Fishton.kt

@@ -6,13 +6,15 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.util.getDimension
-import java.util.ArrayList
 
 /**
  * Created by seokwon.jeong on 04/01/2018.
  */
 object Fishton {
-    lateinit var imageAdapter: ImageAdapter
+    // System may destroy Activity due to system constraints
+    // such as configuration change or memory pressure.
+    // That's why this should be belonged to callsite's lifecycle.
+    var imageAdapter: ImageAdapter? = null
     var currentPickerImageList: List<Uri> = emptyList()
 
     //BaseParams

FishBun/src/main/java/com/sangcomz/fishbun/datasource/FishBunDataSource.kt

@@ -24,7 +24,7 @@ interface FishBunDataSource {
     fun getAllViewTitle(): String
     fun getDetailViewData(): DetailImageViewData
     fun getAlbumViewData(): AlbumViewData
-    fun getImageAdapter(): ImageAdapter
+    fun getImageAdapter(): ImageAdapter?
     fun gatAlbumMenuViewData(): AlbumMenuViewData
     fun getPickerViewData(): PickerViewData
     fun setCurrentPickerImageList(pickerImageList: List<Uri>)

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumContract.kt

@@ -1,6 +1,7 @@
 package com.sangcomz.fishbun.ui.album
 
 import android.net.Uri
+import androidx.annotation.StringRes
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.ui.album.model.Album
 import com.sangcomz.fishbun.ui.album.model.AlbumMenuViewData
@@ -20,6 +21,9 @@ interface AlbumContract {
         fun setToolBar(albumViewData: AlbumViewData)
         fun changeToolbarTitle(selectedImageCount: Int, albumViewData: AlbumViewData)
         fun finishActivityWithResult(selectedImages: List<Uri>)
+
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun refreshAlbumItem(position: Int, imagePath: ArrayList<Uri>)
         fun scanAndRefresh()
         fun showNothingSelectedMessage(nothingSelectedMessage: String)

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/adapter/AlbumListAdapter.kt

@@ -17,7 +17,7 @@ import com.sangcomz.fishbun.util.SquareImageView
 class AlbumListAdapter(
     private val albumClickListener: AlbumClickListener,
     private val thumbnailSize: Int,
-    private val imageAdapter: ImageAdapter?
+    private val imageAdapter: ImageAdapter
 ) :
     RecyclerView.Adapter<AlbumListAdapter.ViewHolder>() {
 
@@ -32,7 +32,6 @@ class AlbumListAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding =
         return ViewHolder(
             parent,
             thumbnailSize,
@@ -70,7 +69,7 @@ class AlbumListAdapter(
     class ViewHolder(
         parent: ViewGroup,
         albumSize: Int,
-        private val imageAdapter: ImageAdapter?
+        private val imageAdapter: ImageAdapter
     ) : RecyclerView.ViewHolder(
         LayoutInflater.from(parent.context).inflate(R.layout.album_item, parent, false)
     ) {
@@ -84,7 +83,7 @@ class AlbumListAdapter(
 
         fun setData(album: Album) {
             val uri: Uri = Uri.parse(album.metaData.thumbnailPath)
-            imageAdapter?.loadImage(imgAlbumThumb, uri)
+            imageAdapter.loadImage(imgAlbumThumb, uri)
 
             itemView.tag = album
             txtAlbumName.text = album.displayName

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/model/repository/AlbumRepository.kt

@@ -15,7 +15,7 @@ interface AlbumRepository {
 
     fun getAlbumViewData(): AlbumViewData
 
-    fun getImageAdapter(): ImageAdapter
+    fun getImageAdapter(): ImageAdapter?
 
     fun getSelectedImageList(): List<Uri>
 

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/mvp/AlbumPresenter.kt

@@ -1,15 +1,15 @@
 package com.sangcomz.fishbun.ui.album.mvp
 
+import android.app.Activity
 import android.net.Uri
-import android.os.Environment
-import com.sangcomz.fishbun.ui.album.model.Album
-import com.sangcomz.fishbun.ui.album.model.repository.AlbumRepository
+import com.sangcomz.fishbun.R
 import com.sangcomz.fishbun.ui.album.AlbumContract
+import com.sangcomz.fishbun.ui.album.model.Album
 import com.sangcomz.fishbun.ui.album.model.AlbumMenuViewData
+import com.sangcomz.fishbun.ui.album.model.repository.AlbumRepository
 import com.sangcomz.fishbun.util.UiHandler
 import com.sangcomz.fishbun.util.future.CallableFutureTask
 import com.sangcomz.fishbun.util.future.FutureCallback
-import java.util.ArrayList
 
 class AlbumPresenter(
     private val albumView: AlbumContract.View,
@@ -21,25 +21,11 @@ class AlbumPresenter(
 
     override fun loadAlbumList() {
         albumListFuture = albumRepository.getAlbumList()
-
-        albumListFuture?.let {
-            it.execute(object : FutureCallback<List<Album>> {
-                override fun onSuccess(result: List<Album>) {
-                    uiHandler.run {
-                        if (result.isNotEmpty()) {
-                            changeToolbarTitle()
-                            albumView.showAlbumList(
-                                it.get(),
-                                albumRepository.getImageAdapter(),
-                                albumRepository.getAlbumViewData()
-                            )
-                        } else {
-                            albumView.showEmptyView()
-                        }
-                    }
-                }
-            })
-        }
+        albumListFuture?.execute(object : FutureCallback<List<Album>> {
+            override fun onSuccess(result: List<Album>) {
+                handleResult(result)
+            }
+        })
     }
 
     override fun takePicture() {
@@ -111,6 +97,30 @@ class AlbumPresenter(
         albumView.scanAndRefresh()
     }
 
+    private fun handleResult(result: List<Album>) {
+        val adapter = albumRepository.getImageAdapter()
+        // imageAdapter is null, so we can not proceed anymore
+        if (adapter == null) {
+            albumView.showToastAndFinish(
+                resId = R.string.msg_error,
+                code = Activity.RESULT_CANCELED,
+            )
+            return
+        }
+        uiHandler.run {
+            if (result.isNotEmpty()) {
+                changeToolbarTitle()
+                albumView.showAlbumList(
+                    result,
+                    adapter,
+                    albumRepository.getAlbumViewData()
+                )
+            } else {
+                albumView.showEmptyView()
+            }
+        }
+    }
+
     companion object {
         private const val defaultDir = "/Camera"
     }

FishBun/src/main/java/com/sangcomz/fishbun/ui/album/ui/AlbumActivity.kt

@@ -13,6 +13,8 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.Group
 import androidx.recyclerview.widget.GridLayoutManager
@@ -25,21 +27,20 @@ import com.sangcomz.fishbun.R
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.datasource.CameraDataSourceImpl
 import com.sangcomz.fishbun.datasource.FishBunDataSourceImpl
-import com.sangcomz.fishbun.ui.album.model.Album
-import com.sangcomz.fishbun.ui.album.model.repository.AlbumRepositoryImpl
 import com.sangcomz.fishbun.datasource.ImageDataSourceImpl
 import com.sangcomz.fishbun.ui.album.AlbumContract
-import com.sangcomz.fishbun.ui.album.mvp.AlbumPresenter
 import com.sangcomz.fishbun.ui.album.adapter.AlbumListAdapter
 import com.sangcomz.fishbun.ui.album.listener.AlbumClickListener
+import com.sangcomz.fishbun.ui.album.model.Album
 import com.sangcomz.fishbun.ui.album.model.AlbumViewData
+import com.sangcomz.fishbun.ui.album.model.repository.AlbumRepositoryImpl
+import com.sangcomz.fishbun.ui.album.mvp.AlbumPresenter
 import com.sangcomz.fishbun.ui.picker.PickerActivity
 import com.sangcomz.fishbun.util.MainUiHandler
 import com.sangcomz.fishbun.util.SingleMediaScanner
 import com.sangcomz.fishbun.util.isLandscape
 import com.sangcomz.fishbun.util.setStatusBarColor
 import java.io.File
-import kotlin.collections.ArrayList
 
 class AlbumActivity : BaseActivity(),
     AlbumContract.View, AlbumClickListener {
@@ -289,6 +290,14 @@ class AlbumActivity : BaseActivity(),
         finish()
     }
 
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
+        }
+        setResult(code, Intent())
+        finish()
+    }
+
     private fun checkPermission(): Boolean {
         return permissionCheck.checkStoragePermission(PERMISSION_STORAGE)
     }

FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailImageContract.kt

@@ -1,7 +1,7 @@
 package com.sangcomz.fishbun.ui.detail
 
 import android.net.Uri
-import android.os.Message
+import androidx.annotation.StringRes
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.ui.detail.model.DetailImageViewData
 
@@ -18,6 +18,9 @@ interface DetailImageContract {
         fun updateRadioButtonWithDrawable()
         fun finishActivity()
         fun finishAndShowErrorToast()
+
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun initViewPagerAdapter(imageAdapter: ImageAdapter)
         fun showImages(initPosition: Int, pickerImages: List<Uri>)
         fun showSnackbar(message: String)

FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/model/DetailImageRepository.kt

@@ -10,7 +10,7 @@ interface DetailImageRepository {
     fun getImageIndex(imageUri: Uri): Int
     fun selectImage(imageUri: Uri)
     fun unselectImage(imageUri: Uri)
-    fun getImageAdapter(): ImageAdapter
+    fun getImageAdapter(): ImageAdapter?
     fun isFullSelected(): Boolean
     fun checkForFinish(): Boolean
     fun getMessageLimitReached(): String

FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/mvp/DetailImagePresenter.kt

@@ -1,7 +1,8 @@
 package com.sangcomz.fishbun.ui.detail.mvp
 
+import android.app.Activity
 import android.net.Uri
-import androidx.annotation.VisibleForTesting
+import com.sangcomz.fishbun.R
 import com.sangcomz.fishbun.ui.detail.DetailImageContract
 import com.sangcomz.fishbun.ui.detail.model.DetailImageRepository
 
@@ -66,7 +67,16 @@ class DetailImagePresenter(
     }
 
     private fun initViewPagerAdapter() {
-        detailView.initViewPagerAdapter(detailImageRepository.getImageAdapter())
+        val adapter = detailImageRepository.getImageAdapter()
+        // we can not proceed any more if imageAdapter is null
+        if (adapter == null) {
+            detailView.showToastAndFinish(
+                resId = R.string.msg_error,
+                code = Activity.RESULT_CANCELED,
+            )
+            return
+        }
+        detailView.initViewPagerAdapter(adapter)
     }
 
     private fun changeButtonStatusInternal(imageUri: Uri) {

FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/ui/DetailImageActivity.kt

@@ -7,10 +7,10 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.view.Window
 import android.widget.ImageButton
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.viewpager.widget.ViewPager
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
@@ -129,6 +129,14 @@ class DetailImageActivity : BaseActivity(), DetailImageContract.View, OnPageChan
         finish()
     }
 
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
+        }
+        setResult(code, Intent())
+        finish()
+    }
+
     override fun initViewPagerAdapter(imageAdapter: ImageAdapter) {
         vpDetailPager?.run {
             adapter = DetailViewPagerAdapter(imageAdapter)

FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.kt

@@ -13,6 +13,8 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -387,6 +389,14 @@ class PickerActivity : BaseActivity(),
         finish()
     }
 
+    override fun showToastAndFinish(@StringRes resId: Int, code: Int) {
+        runOnUiThread {
+            Toast.makeText(this, resId, Toast.LENGTH_SHORT).show()
+        }
+        setResult(code, Intent())
+        finish()
+    }
+
     private fun setImageList(
         pickerList: List<PickerListItem>,
         imageAdapter: ImageAdapter,

FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerContract.kt

@@ -1,6 +1,7 @@
 package com.sangcomz.fishbun.ui.picker
 
 import android.net.Uri
+import androidx.annotation.StringRes
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import com.sangcomz.fishbun.ui.picker.model.PickerListItem
 import com.sangcomz.fishbun.ui.picker.model.PickerMenuViewData
@@ -13,12 +14,14 @@ interface PickerContract {
             adapter: ImageAdapter,
             hasCameraInPickerPage: Boolean
         )
+
         fun takePicture(saveDir: String)
         fun setToolbarTitle(
             pickerViewData: PickerViewData,
             selectedCount: Int,
             albumName: String
         )
+
         fun initToolBar(pickerViewData: PickerViewData)
         fun initRecyclerView(pickerViewData: PickerViewData)
         fun showLimitReachedMessage(messageLimitReached: String)
@@ -27,6 +30,9 @@ interface PickerContract {
         fun onCheckStateChange(position: Int, image: PickerListItem.Image)
         fun showDetailView(position: Int)
         fun finishActivity()
+
+        /* show toast and finish the Activity */
+        fun showToastAndFinish(@StringRes resId: Int, code: Int)
         fun finishActivityWithResult(selectedImages: List<Uri>)
         fun takeANewPictureWithFinish(position: Int, addedImageList: List<Uri>)
         fun addImage(pickerListImage: PickerListItem.Image)