From a02f1efaf494d881feb2327805d917ed5b1e78de Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Wed, 18 Jan 2023 09:35:53 -0800
Subject: [PATCH] remove old web reader

---
 .../main/java/app/omnivore/omnivore/Routes.kt |  1 -
 .../ReadingProgressChangeHandler.kt           |  3 ++
 .../omnivore/ui/reader/WebAppReader.kt        | 45 -------------------
 .../omnivore/ui/reader/WebReaderViewModel.kt  |  1 +
 .../app/omnivore/omnivore/ui/root/RootView.kt |  8 ----
 5 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebAppReader.kt

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Routes.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Routes.kt
index d30d337a6..a1e5ece80 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Routes.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Routes.kt
@@ -2,6 +2,5 @@ package app.omnivore.omnivore
 
 sealed class Routes(val route: String) {
     object Library : Routes("Library")
-    object WebAppReader : Routes("WebAppReader")
     object Settings: Routes("Settings")
 }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/ReadingProgressChangeHandler.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/ReadingProgressChangeHandler.kt
index 98e175ddd..3138048d7 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/ReadingProgressChangeHandler.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/ReadingProgressChangeHandler.kt
@@ -1,5 +1,6 @@
 package app.omnivore.omnivore.dataService
 
+import android.util.Log
 import app.omnivore.omnivore.models.ServerSyncStatus
 import app.omnivore.omnivore.networking.ReadingProgressParams
 import app.omnivore.omnivore.networking.updateReadingProgress
@@ -12,6 +13,7 @@ suspend fun DataService.updateWebReadingProgress(jsonString: String) {
   val savedItemId = readingProgressParams.id ?: return
 
   withContext(Dispatchers.IO) {
+    Log.d("sync", "updating progress")
     val savedItem = db.savedItemDao().findById(savedItemId) ?: return@withContext
     savedItem.readingProgress = readingProgressParams.readingProgressPercent ?: 0.0
     savedItem.readingProgressAnchor = readingProgressParams.readingProgressAnchorIndex ?: 0
@@ -22,6 +24,7 @@ suspend fun DataService.updateWebReadingProgress(jsonString: String) {
 
     if (isUpdatedOnServer) {
       savedItem.serverSyncStatus = ServerSyncStatus.IS_SYNCED.rawValue
+      Log.d("sync", "saved item progress: ${savedItem.readingProgress}")
       db.savedItemDao().update(savedItem)
     }
   }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebAppReader.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebAppReader.kt
deleted file mode 100644
index ab77cfd32..000000000
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebAppReader.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package app.omnivore.omnivore.ui.reader
-
-import android.annotation.SuppressLint
-import android.view.ViewGroup
-import android.webkit.CookieManager
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.viewinterop.AndroidView
-import app.omnivore.omnivore.BuildConfig
-
-@SuppressLint("SetJavaScriptEnabled")
-@Composable
-fun ArticleWebView(slug: String, authCookieString: String) {
-  WebView.setWebContentsDebuggingEnabled(true)
-
-  val url = BuildConfig.OMNIVORE_WEB_URL + "/app/me/$slug"
-
-  AndroidView(factory = {
-    WebView(it).apply {
-      layoutParams = ViewGroup.LayoutParams(
-        ViewGroup.LayoutParams.MATCH_PARENT,
-        ViewGroup.LayoutParams.MATCH_PARENT
-      )
-
-      settings.javaScriptEnabled = true
-      settings.allowContentAccess = true
-      settings.allowFileAccess = true
-      settings.domStorageEnabled = true
-
-      webViewClient = object : WebViewClient() {
-      }
-
-      CookieManager.getInstance().setAcceptThirdPartyCookies(this, true)
-      CookieManager.getInstance().setAcceptCookie(true)
-      CookieManager.getInstance().setCookie(BuildConfig.OMNIVORE_API_URL, authCookieString)
-      CookieManager.getInstance().setCookie(BuildConfig.OMNIVORE_WEB_URL, authCookieString) {
-        loadUrl(url)
-      }
-    }
-  }, update = {
-    it.loadUrl(url)
-  })
-}
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
index dfb472e8d..6f6f013aa 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
@@ -137,6 +137,7 @@ class WebReaderViewModel @Inject constructor(
         }
       }
       "articleReadingProgress" -> {
+        Log.d("sync", "articleReadingProgressMesssageReceived")
         viewModelScope.launch {
           dataService.updateWebReadingProgress(jsonString)
         }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/root/RootView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/root/RootView.kt
index e22d3ac18..76be9653d 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/root/RootView.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/root/RootView.kt
@@ -79,14 +79,6 @@ fun PrimaryNavigator(
       )
     }
 
-    // TODO: delete this route and views
-    composable("WebAppReader/{slug}") {
-      ArticleWebView(
-        it.arguments?.getString("slug") ?: "",
-        authCookieString = loginViewModel.getAuthCookieString() ?: ""
-      )
-    }
-
     composable("WebReader/{slug}") {
       webReaderViewModel.reset() // clear previously loaded item