aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2018-12-29 15:10:11 -0500
committerAllan Wang <me@allanwang.ca>2018-12-29 15:10:11 -0500
commita9acbb16b241b44d3ecd2a75c2bde31be575e2b5 (patch)
treed4aa913662d89cd04553f884d9c98cdf156ca329 /app
parent625cff050cae2bbdcd4eea49d81233414288b1de (diff)
downloadfrost-a9acbb16b241b44d3ecd2a75c2bde31be575e2b5.tar.gz
frost-a9acbb16b241b44d3ecd2a75c2bde31be575e2b5.tar.bz2
frost-a9acbb16b241b44d3ecd2a75c2bde31be575e2b5.zip
Remove paper parcel, resolves #1193
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle8
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt15
2 files changed, 7 insertions, 16 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 5a4acdfb..23ba05d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,6 +144,10 @@ android {
}
}
+ androidExtensions {
+ experimental = true
+ }
+
}
repositories {
@@ -233,10 +237,6 @@ dependencies {
implementation "co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}"
- implementation "nz.bradcampbell:paperparcel:${PAPER_PARCEL}"
- implementation "nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}"
- kapt "nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}"
-
implementation "com.bugsnag:bugsnag-android:${BUGSNAG}"
implementation "com.davemorrissey.labs:subsampling-scale-image-view:${SCALE_IMAGE_VIEW}"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index db3bf973..8678f997 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -16,7 +16,6 @@
*/
package com.pitchedapps.frost.dbflow
-import android.os.Parcel
import android.os.Parcelable
import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.pitchedapps.frost.facebook.FbItem
@@ -37,7 +36,7 @@ import com.raizlabs.android.dbflow.kotlinextensions.where
import com.raizlabs.android.dbflow.structure.BaseModel
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
-import paperparcel.PaperParcel
+import kotlinx.android.parcel.Parcelize
import java.net.UnknownHostException
/**
@@ -50,18 +49,10 @@ object CookiesDb {
const val VERSION = 2
}
-@PaperParcel
+@Parcelize
@Table(database = CookiesDb::class, allFields = true, primaryKeyConflict = ConflictAction.REPLACE)
data class CookieModel(@PrimaryKey var id: Long = -1L, var name: String? = null, var cookie: String? = null) :
- BaseModel(), Parcelable {
- companion object {
- @JvmField
- val CREATOR = PaperParcelCookieModel.CREATOR
- }
-
- override fun describeContents() = 0
- override fun writeToParcel(dest: Parcel, flags: Int) = PaperParcelCookieModel.writeToParcel(this, dest, flags)
-}
+ BaseModel(), Parcelable
fun loadFbCookie(id: Long): CookieModel? =
(select from CookieModel::class where (CookieModel_Table.id eq id)).querySingle()