diff options
| author | Allan Wang <me@allanwang.ca> | 2020-02-23 16:36:31 -0800 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2020-02-23 16:36:31 -0800 |
| commit | 0dfc1b3e6542b9deca6c56236b46e71e4c6976f5 (patch) | |
| tree | d16e4c34b86b0cc236fce32baa38d71f3b7adfbf /app/src/main/kotlin/com/pitchedapps/frost/fragments | |
| parent | cd69ccf7c49f486a6c90a7cee0d32a74ea00247d (diff) | |
| download | frost-0dfc1b3e6542b9deca6c56236b46e71e4c6976f5.tar.gz frost-0dfc1b3e6542b9deca6c56236b46e71e4c6976f5.tar.bz2 frost-0dfc1b3e6542b9deca6c56236b46e71e4c6976f5.zip | |
Remove singleton pattern for fbcookie
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/fragments')
3 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt index e1767848..84cd60c8 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt @@ -32,6 +32,7 @@ import com.pitchedapps.frost.contracts.FrostContentParent import com.pitchedapps.frost.contracts.MainActivityContract import com.pitchedapps.frost.contracts.MainFabContract import com.pitchedapps.frost.enums.FeedSort +import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.utils.ARG_URL import com.pitchedapps.frost.utils.L @@ -82,6 +83,7 @@ abstract class BaseFragment : Fragment(), CoroutineScope, KoinComponent, Fragmen } } + protected val fbCookie: FbCookie by inject() protected val prefs: Prefs by inject() open lateinit var job: Job override val coroutineContext: CoroutineContext diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt index 21ba17ae..22d2aa8c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt @@ -130,7 +130,7 @@ abstract class FrostParserFragment<T : ParseData, Item : GenericItem> : override suspend fun reloadImpl(progress: (Int) -> Unit): List<Item>? = withContext(Dispatchers.IO) { progress(10) - val cookie = FbCookie.webCookie + val cookie = fbCookie.webCookie val doc = getDoc(cookie) progress(60) val response = try { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt index f45ffa6d..35b390c4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt @@ -40,6 +40,6 @@ class NotificationFragment : FrostParserFragment<FrostNotifs, NotificationIItem> response.data.notifs.map { NotificationIItem(it, response.cookie) } override fun bindImpl(recyclerView: FrostRecyclerView) { - NotificationIItem.bindEvents(adapter) + NotificationIItem.bindEvents(adapter, fbCookie) } } |