fix adapter initialization

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/androidTest/java/com/owncloud/android/ui/fragment/NotificationsFragmentIT.kt

@@ -8,11 +8,14 @@
  */
 package com.owncloud.android.ui.fragment
 
+import android.net.Uri
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.platform.app.InstrumentationRegistry
+import com.nextcloud.common.NextcloudClient
 import com.nextcloud.test.GrantStoragePermissionRule.Companion.grant
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.lib.resources.notifications.models.Action
@@ -39,6 +42,15 @@ class NotificationsFragmentIT : AbstractIT() {
         return cal.time
     }
 
+    private val testClient: NextcloudClient by lazy {
+        NextcloudClient(
+            Uri.parse("https://cloud.example.com"),
+            "testuser",
+            "Basic dXNlcjpwYXNz",
+            targetContext
+        )
+    }
+
     private fun buildNotificationNoActions(): Notification = Notification(
         1,
         "files",
@@ -98,7 +110,8 @@ class NotificationsFragmentIT : AbstractIT() {
             "Help improve Nextcloud",
             "SubjectRich",
             HashMap(),
-            "Do you want to help us to improve Nextcloud by providing some anonymize data about your setup and usage?",
+            "Do you want to help us to improve Nextcloud by providing some anonymize data about your setup" +
+                " and usage?",
             "MessageRich",
             HashMap(),
             "link",
@@ -122,9 +135,11 @@ class NotificationsFragmentIT : AbstractIT() {
         val intent = NavigatorActivity.intent(targetContext, NavigatorScreen.Notifications)
         ActivityScenario.launch<NavigatorActivity>(intent).use { scenario ->
             scenario.onActivity { sut ->
-                findFragment(sut)?.populateList(ArrayList())
+                findFragment(sut)?.populateList(ArrayList(), testClient)
             }
 
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
             val screenShotName = createName(testClassName + "_" + "empty", "")
             onView(isRoot()).check(matches(isDisplayed()))
 
@@ -140,7 +155,7 @@ class NotificationsFragmentIT : AbstractIT() {
         val intent = NavigatorActivity.intent(targetContext, NavigatorScreen.Notifications)
         ActivityScenario.launch<NavigatorActivity>(intent).use { scenario ->
             scenario.onActivity { sut ->
-                findFragment(sut)?.populateList(buildMockNotifications())
+                findFragment(sut)?.populateList(buildMockNotifications(), testClient)
             }
 
             val screenShotName = createName(testClassName + "_" + "showNotifications", "")

app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.kt

@@ -52,7 +52,7 @@ import kotlinx.coroutines.withContext
 
 @Suppress("TooManyFunctions")
 class NotificationListAdapter(
-    private val client: NextcloudClient?,
+    private val client: NextcloudClient,
     private val fragment: NotificationsFragment,
     private val viewThemeUtils: ViewThemeUtils
 ) : RecyclerView.Adapter<NotificationListAdapter.NotificationViewHolder>() {
@@ -167,12 +167,12 @@ class NotificationListAdapter(
         holder.binding.dismiss.setOnClickListener {
             fragment.lifecycleScope.launch(Dispatchers.IO) {
                 val result =
-                    client?.let { clientValue ->
-                        DeleteNotificationRemoteOperation(notification.notificationId).execute(
-                            clientValue
-                        )
-                    }
-                withContext(Dispatchers.Main) { fragment.onRemovedNotification(result?.isSuccess == true) }
+                    DeleteNotificationRemoteOperation(notification.notificationId).execute(
+                        client
+                    )
+                withContext(Dispatchers.Main) {
+                    fragment.onRemovedNotification(result?.isSuccess == true, client)
+                }
             }
         }
 
@@ -272,7 +272,7 @@ class NotificationListAdapter(
                 Intent(Intent.ACTION_VIEW).apply { data = action.link?.toUri() }
             )
         } else {
-            client?.let { NotificationExecuteActionTask(it, holder, notification, fragment) }?.execute(action)
+            NotificationExecuteActionTask(client, holder, notification, fragment).execute(action)
         }
     }
 

app/src/main/java/com/owncloud/android/ui/fragment/notifications/NotificationsFragment.kt

@@ -29,7 +29,6 @@ import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.jobs.NotificationWork
-import com.nextcloud.client.network.ClientFactory
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.common.NextcloudClient
 import com.nextcloud.utils.BuildHelper
@@ -62,15 +61,12 @@ class NotificationsFragment :
     private var binding: NotificationsLayoutBinding? = null
     private var adapter: NotificationListAdapter? = null
     private var snackbar: Snackbar? = null
-    private var client: NextcloudClient? = null
     private var optionalUser: Optional<User>? = null
 
     @Inject lateinit var viewThemeUtils: ViewThemeUtils
 
     @Inject lateinit var accountManager: UserAccountManager
 
-    @Inject lateinit var clientFactory: ClientFactory
-
     @Inject lateinit var preferences: AppPreferences
 
     // region Lifecycle
@@ -81,12 +77,23 @@ class NotificationsFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupMenu()
-        initUser()
-        setupSwipeRefresh()
-        setupPushWarning()
-        setupContent()
-        if (optionalUser?.isPresent == false) showError()
+
+        lifecycleScope.launch {
+            val baseActivity = getTypedActivity(BaseActivity::class.java)
+            val client = baseActivity?.clientRepository?.getNextcloudClient() ?: run {
+                showError()
+                return@launch
+            }
+
+            withContext(Dispatchers.Main) {
+                setupMenu(client)
+                initUser()
+                setupSwipeRefresh(client)
+                setupPushWarning()
+                setupContent(client)
+                if (optionalUser?.isPresent == false) showError()
+            }
+        }
     }
 
     override fun onDestroyView() {
@@ -104,32 +111,32 @@ class NotificationsFragment :
         }
     }
 
-    private fun setupSwipeRefresh() {
+    private fun setupSwipeRefresh(client: NextcloudClient) {
         binding?.run {
             viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeContainingList)
             viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeContainingEmpty)
             swipeContainingList.setOnRefreshListener {
                 setLoadingMessage()
                 swipeContainingList.isRefreshing = true
-                fetchAndSetData()
+                fetchAndSetData(client)
             }
             swipeContainingEmpty.setOnRefreshListener {
                 setLoadingMessageEmpty()
-                fetchAndSetData()
+                fetchAndSetData(client)
             }
         }
     }
 
-    private fun setupContent() {
+    private fun setupContent(client: NextcloudClient) {
         binding?.run {
             emptyList.emptyListIcon.setImageResource(R.drawable.ic_notification)
             setLoadingMessageEmpty()
             list.layoutManager = LinearLayoutManager(requireContext())
-            fetchAndSetData()
+            fetchAndSetData(client)
         }
     }
 
-    private fun setupMenu() {
+    private fun setupMenu(client: NextcloudClient) {
         (requireActivity() as MenuHost).addMenuProvider(
             object : MenuProvider {
                 override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
@@ -139,7 +146,7 @@ class NotificationsFragment :
                 override fun onMenuItemSelected(item: MenuItem): Boolean {
                     if (item.itemId != R.id.action_empty_notifications) return false
                     lifecycleScope.launch(Dispatchers.IO) {
-                        val result = DeleteAllNotificationsRemoteOperation().execute(client!!)
+                        val result = DeleteAllNotificationsRemoteOperation().execute(client)
                         withContext(Dispatchers.Main) { onRemovedAllNotifications(result.isSuccess) }
                     }
                     return true
@@ -186,13 +193,13 @@ class NotificationsFragment :
     // endregion
 
     // region Data loading
-    private fun fetchAndSetData() {
+    private fun fetchAndSetData(client: NextcloudClient) {
         lifecycleScope.launch(Dispatchers.IO) {
-            initializeAdapter()
-            val result = client?.let { GetNotificationsRemoteOperation().execute(it) }
+            initializeAdapter(client)
+            val result = GetNotificationsRemoteOperation().execute(client)
             withContext(Dispatchers.Main) {
                 if (result?.isSuccess == true && result.resultData != null) {
-                    populateList(result.resultData ?: listOf())
+                    populateList(result.resultData ?: listOf(), client)
                 } else {
                     try {
                         Log_OC.d(TAG, result?.logMessage)
@@ -208,17 +215,10 @@ class NotificationsFragment :
         }
     }
 
-    private fun initializeAdapter() {
-        lifecycleScope.launch {
-            val baseActivity = getTypedActivity(BaseActivity::class.java)
-            client = baseActivity?.clientRepository?.getNextcloudClient()
-
-            withContext(Dispatchers.Main) {
-                if (adapter == null) {
-                    adapter = NotificationListAdapter(client, this@NotificationsFragment, viewThemeUtils)
-                    binding?.list?.adapter = adapter
-                }
-            }
+    private fun initializeAdapter(client: NextcloudClient) {
+        if (adapter == null) {
+            adapter = NotificationListAdapter(client, this@NotificationsFragment, viewThemeUtils)
+            binding?.list?.adapter = adapter
         }
     }
 
@@ -229,9 +229,8 @@ class NotificationsFragment :
     // endregion
 
     // region View state
-    @VisibleForTesting
-    fun populateList(notifications: List<Notification>) {
-        initializeAdapter()
+    fun populateList(notifications: List<Notification>, client: NextcloudClient) {
+        initializeAdapter(client)
         adapter?.setNotificationItems(notifications)
         binding?.run {
             loadingContent.visibility = View.GONE
@@ -289,10 +288,10 @@ class NotificationsFragment :
     // endregion
 
     // region callbacks
-    override fun onRemovedNotification(isSuccess: Boolean) {
+    override fun onRemovedNotification(isSuccess: Boolean, client: NextcloudClient) {
         if (!isSuccess) {
             DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.remove_notification_failed))
-            fetchAndSetData()
+            fetchAndSetData(client)
         }
     }
 

app/src/main/java/com/owncloud/android/ui/notifications/NotificationsContract.kt

@@ -7,12 +7,13 @@
  */
 package com.owncloud.android.ui.notifications
 
+import com.nextcloud.common.NextcloudClient
 import com.owncloud.android.lib.resources.notifications.models.Notification
 import com.owncloud.android.ui.adapter.NotificationListAdapter.NotificationViewHolder
 
 interface NotificationsContract {
     interface View {
-        fun onRemovedNotification(isSuccess: Boolean)
+        fun onRemovedNotification(isSuccess: Boolean, client: NextcloudClient)
 
         fun removeNotification(holder: NotificationViewHolder)