feat: Handle public instances (#126)

Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
2023-01-28 10:25:28 +00:00
parent fc31a4399c
commit f28e702549
13 changed files with 206 additions and 71 deletions
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@ -115,10 +115,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            }
        }

+        val swipeDirs = if (appSettingsService.getPublicAccess()) {
+            0
+        } else {
+            ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+        }
+
        val simpleItemTouchCallback =
            object : ItemTouchHelper.SimpleCallback(
                0,
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+                swipeDirs
            ) {
                override fun getSwipeDirs(
                    recyclerView: RecyclerView,
@ -511,6 +517,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        val inflater = menuInflater
        inflater.inflate(R.menu.home_menu, menu)
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.readAll)
+            menu.removeItem(R.id.action_sources)
+        }

        val searchItem = menu.findItem(R.id.action_search)
        val searchView = searchItem.getActionView() as SearchView
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
@ -128,7 +128,7 @@ class LoginActivity : AppCompatActivity(), DIAware {

    private fun goToMain() {
        CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiVersion()
+            repository.updateApiInformation()
            ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
        }
        val intent = Intent(this, HomeActivity::class.java)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@ -84,7 +84,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
    }

    private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
            CoroutineScope(Dispatchers.IO).launch {
                repository.markAsRead(item)
            }
@ -137,28 +137,34 @@ class ReaderActivity : AppCompatActivity(), DIAware {
        inflater.inflate(R.menu.reader_menu, menu)
        toolbarMenu = menu

-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-            canRemoveFromFavorite()
-        } else {
-            canFavorite()
-        }
        alignmentMenu()

-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.star)
+        } else {
+            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+                canRemoveFromFavorite()
+            } else {
+                canFavorite()
            }
-        )
+
+
+            binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                }
+            )
+        }

        return true
    }
@ -177,7 +183,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {

        when (item.itemId) {
            android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                return true
            }
            R.id.star -> {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
@ -56,6 +56,10 @@ class ItemCardAdapter(
            val itm = items[position]

            binding.favButton.isSelected = itm.starred
+            if (appSettingsService.getPublicAccess()) {
+                binding.favButton.visibility = View.GONE
+            }
+
            binding.title.text = itm.title.getHtmlDecoded()

            binding.title.setOnTouchListener(LinkOnTouchListener())
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
@ -195,6 +195,9 @@ class ArticleFragment : Fragment(), DIAware {

    private fun handleFloatingToolbar(): FloatingToolbar {
        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+        if (appSettingsService.getPublicAccess()) {
+            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+        }
        floatingToolbar.attachFab(fab)

        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
--- a/androidApp/src/main/res/layout/card_item.xml
+++ b/androidApp/src/main/res/layout/card_item.xml
@ -47,7 +47,6 @@
                android:id="@+id/sourceImage"
                android:layout_width="40dp"
                android:layout_height="40dp"
-                android:layout_marginLeft="8dp"
                android:layout_marginStart="8dp"
                android:layout_marginTop="8dp"
                app:layout_constraintLeft_toLeftOf="parent"
@ -85,41 +84,32 @@
                app:layout_constraintTop_toBottomOf="@+id/title"
                tools:text="Google Actualité Il y a 5h" />

-            <RelativeLayout
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
+                android:layout_marginEnd="8dp"
                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">

                <ImageButton
-                    android:id="@+id/favButton"
+                    android:id="@+id/browserBtn"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
                    android:padding="4dp"
                    android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
-                    app:tint="@color/ic_menu_heart_color" />
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />

                <ImageButton
                    android:id="@+id/shareBtn"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/favButton"
-                    android:layout_toStartOf="@+id/favButton"
+                    android:layout_marginStart="16dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
@ -129,23 +119,21 @@
                    app:tint="?android:attr/textColorPrimary" />

                <ImageButton
-                    android:id="@+id/browserBtn"
+                    android:id="@+id/favButton"
                    android:layout_width="35dp"
                    android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/shareBtn"
-                    android:layout_toStartOf="@+id/shareBtn"
+                    android:layout_marginStart="16dp"
                    android:adjustViewBounds="true"
                    android:background="@android:color/transparent"
                    android:elevation="5dp"
                    android:padding="4dp"
                    android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />

-            </RelativeLayout>
+
+
+            </LinearLayout>

        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
--- a/androidApp/src/main/res/layout/fragment_article.xml
+++ b/androidApp/src/main/res/layout/fragment_article.xml
@ -83,7 +83,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_gravity="end|bottom|right">
+        android:layout_gravity="end|bottom|end">

        <com.github.rubensousa.floatingtoolbar.FloatingToolbar
            android:id="@+id/floatingToolbar"
@ -96,10 +96,9 @@
            android:id="@+id/fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom|right"
+            android:layout_gravity="end|bottom|end"
            android:layout_marginBottom="16dp"
            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
            android:paddingBottom="@dimen/activity_vertical_margin"
            android:paddingTop="@dimen/activity_vertical_margin"
            android:src="@drawable/ic_add_white_24dp"
--- a/androidApp/src/main/res/menu/reader_toolbar_no_read.xml
+++ b/androidApp/src/main/res/menu/reader_toolbar_no_read.xml
@ -0,0 +1,16 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/open_action"
+        android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:title="@string/reader_action_open"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/share_action"
+        android:icon="@drawable/ic_share_white_24dp"
+        android:title="@string/reader_action_share"
+        app:showAsAction="ifRoom" />
+
+</menu>
--- a/androidApp/src/test/kotlin/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/RepositoryTest.kt
@ -20,6 +20,8 @@ import org.junit.Test

 private const val BASE_URL = "https://test.com/selfoss/"

+private const val USERNAME = "username"
+
 private const val SPOUT = "spouts\\rss\\fulltextrss"

 private const val IMAGE_URL = "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
@ -49,7 +51,7 @@ class RepositoryTest {
        repository = Repository(api, appSettingsService, isConnectionAvailable, db)

        runBlocking {
-            repository.updateApiVersion()
+            repository.updateApiInformation()
        }
    }

@ -58,12 +60,13 @@ class RepositoryTest {
        clearAllMocks()
        every { appSettingsService.getApiVersion() } returns 4
        every { appSettingsService.getBaseUrl() } returns BASE_URL
+        every { appSettingsService.getUserName() } returns USERNAME
        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns false

-        coEvery { api.version() } returns StatusAndData(
+        coEvery { api.apiInformation() } returns StatusAndData(
            success = true,
-            data = SelfossModel.ApiVersion("2.19-ba1e8e3", "4.0.0")
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
        )
        coEvery { api.stats() } returns StatusAndData(
            success = true,
@ -81,7 +84,7 @@ class RepositoryTest {
    fun instantiate_repository() {
        initializeRepository()

-        coVerify(exactly = 1) { api.version() }
+        coVerify(exactly = 1) { api.apiInformation() }
    }

    @Test
@ -90,7 +93,7 @@ class RepositoryTest {

        initializeRepository(MutableStateFlow(false))

-        coVerify(exactly = 0) { api.version() }
+        coVerify(exactly = 0) { api.apiInformation() }
        coVerify(exactly = 0) { api.stats() }
    }

@ -110,10 +113,70 @@ class RepositoryTest {
        verify(exactly = 1) { appSettingsService.updateApiVersion(4) }
    }

+    @Test
+    fun get_public_access() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns StatusAndData(
+            success = true,
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
+        )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 1) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_username_not_empty() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns StatusAndData(
+            success = true,
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
+        )
+        every { appSettingsService.getUserName() } returns "username"
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_no_auth() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns StatusAndData(
+            success = true,
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false))
+        )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_disabled() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns StatusAndData(
+            success = true,
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
+        )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
    @Test
    fun get_api_1_date_with_api_4_version_stored() {
        every { appSettingsService.getApiVersion() } returns 4
-        coEvery { api.version() } returns StatusAndData(success = false, null)
+        coEvery { api.apiInformation() } returns StatusAndData(success = false, null)
        val itemParameters = FakeItemParameters()
        itemParameters.datetime = "2021-04-23 11:45:32"
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns