From 914b7a235d54b1d59ed7a9d73b55d5ad2f18f2c2 Mon Sep 17 00:00:00 2001 From: George Zacharia Date: Mon, 9 Sep 2019 10:51:05 +0530 Subject: [PATCH] Fix build $SRCDIR\data\src\main\java\com\moez\QKSMS\manager\ChangelogManagerImpl.kt: (59, 31): Using 'parse(String): HttpUrl?' is an error. moved to extension function $SRCDIR\data\src\main\java\com\moez\QKSMS\manager\ChangelogManagerImpl.kt: (72, 45): Using 'body(): ResponseBody?' is an error. moved to val $SRCDIR/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt: (161, 30): Using 'buffer(Source): BufferedSource' is an error. moved to extension function $SRCDIR/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt: (161, 42): Using 'source(File): Source' is an error. moved to extension function $SRCDIR/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt: (180, 27): Using 'buffer(Source): BufferedSource' is an error. moved to extension function $SRCDIR/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt: (180, 39): Using 'source(File): Source' is an error. moved to extension function --- .../moez/QKSMS/manager/ChangelogManagerImpl.kt | 16 +++++++++------- .../QKSMS/repository/BackupRepositoryImpl.kt | 7 ++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt index ef25123d..14642017 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt @@ -27,7 +27,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import okhttp3.Call import okhttp3.Callback -import okhttp3.HttpUrl +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -56,20 +56,22 @@ class ChangelogManagerImpl @Inject constructor( override fun getChangelog(): Single { val url = "https://firestore.googleapis.com/v1/projects/qksms-app/databases/(default)/documents/changelog" - val httpUrl = HttpUrl.parse(url) - val request = Request.Builder().url(httpUrl).build() - val call = OkHttpClient().newCall(request) + val httpUrl = url.toHttpUrlOrNull() + val request = httpUrl?.let { Request.Builder().url(it).build() } + val call = request?.let { OkHttpClient().newCall(it) } val adapter = moshi.adapter(ChangelogResponse::class.java) return Single .create { emitter -> - emitter.setCancellable { call.cancel() } - call.enqueue(object : Callback { + emitter.setCancellable { + call?.cancel() + } + call?.enqueue(object : Callback { override fun onResponse(call: Call, response: Response) = emitter.onSuccess(response) override fun onFailure(call: Call, e: IOException) = emitter.onError(e) }) } - .map { response -> response.body()?.string()?.let(adapter::fromJson) } + .map { response -> response.body?.string()?.let(adapter::fromJson) } .map { response -> response.documents .sortedBy { document -> document.fields.versionCode.value } diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index e06e974b..9fff3db3 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -33,7 +33,8 @@ import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.Realm -import okio.Okio +import okio.buffer +import okio.source import timber.log.Timber import java.io.File import java.io.FileOutputStream @@ -158,7 +159,7 @@ class BackupRepositoryImpl @Inject constructor( files.mapNotNull { file -> val adapter = moshi.adapter(BackupMetadata::class.java) val backup = tryOrNull(false) { - Okio.buffer(Okio.source(file)).use(adapter::fromJson) + file.source().buffer().use(adapter::fromJson) } ?: return@mapNotNull null val path = file.path @@ -177,7 +178,7 @@ class BackupRepositoryImpl @Inject constructor( restoreProgress.onNext(BackupRepository.Progress.Parsing()) val file = File(filePath) - val backup = Okio.buffer(Okio.source(file)).use { source -> + val backup = file.source().buffer().use { source -> moshi.adapter(Backup::class.java).fromJson(source) }