fix(drawer): external site links no longer stop working over time

app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.kt

@@ -10,10 +10,15 @@ package com.owncloud.android.ui.activity
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.content.ContentValues
 import android.net.Uri
 import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.DrawerActions
+import androidx.test.espresso.contrib.NavigationViewActions
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
@@ -26,6 +31,8 @@ import com.nextcloud.test.RetryTestRule
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
+import com.owncloud.android.lib.common.ExternalLinkType
 import com.owncloud.android.lib.common.accounts.AccountUtils
 import org.hamcrest.Matchers
 import org.junit.Assert
@@ -73,7 +80,71 @@ class DrawerActivityIT : AbstractIT() {
         onView(ViewMatchers.withText(account1?.name)).perform(ViewActions.click())
     }
 
+    /**
+     * External link menu items get the item id [MENU_ITEM_EXTERNAL_LINK] + the link's local database id, and that
+     * id grows without bound because the table is cleared and refilled on every refresh. A link whose id has grown
+     * past the legacy 0-100 window must still open.
+     */
+    @Test
+    fun externalLinkWithIdBeyondLegacyRangeIsOpened() {
+        insertExternalLink()
+
+        Intents.init()
+        try {
+            launchActivity<FileDisplayActivity>().use {
+                waitForIdleSync()
+
+                onView(ViewMatchers.withId(R.id.drawer_layout)).perform(DrawerActions.open())
+                onView(ViewMatchers.withId(R.id.nav_view))
+                    .perform(NavigationViewActions.navigateTo(MENU_ITEM_EXTERNAL_LINK + EXTERNAL_LINK_ID))
+
+                Intents.intended(IntentMatchers.hasComponent(ExternalSiteWebView::class.java.name))
+                Intents.intended(IntentMatchers.hasExtra(ExternalSiteWebView.EXTRA_URL, EXTERNAL_LINK_URL))
+            }
+        } finally {
+            Intents.release()
+            deleteExternalLink()
+        }
+    }
+
+    private fun insertExternalLink() {
+        val values = ContentValues().apply {
+            put(ProviderTableMeta._ID, EXTERNAL_LINK_ID)
+            put(ProviderTableMeta.EXTERNAL_LINKS_ICON_URL, "")
+            put(ProviderTableMeta.EXTERNAL_LINKS_LANGUAGE, "en")
+            put(ProviderTableMeta.EXTERNAL_LINKS_TYPE, ExternalLinkType.LINK.toString())
+            put(ProviderTableMeta.EXTERNAL_LINKS_NAME, EXTERNAL_LINK_NAME)
+            put(ProviderTableMeta.EXTERNAL_LINKS_URL, EXTERNAL_LINK_URL)
+            put(ProviderTableMeta.EXTERNAL_LINKS_REDIRECT, false)
+        }
+
+        val uri = targetContext.contentResolver.insert(ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS, values)
+        Assert.assertNotNull("External link could not be stored", uri)
+
+        // the whole point of the test is an id outside the legacy window, so fail loudly if it was not honoured
+        Assert.assertTrue(
+            "External link id must exceed the legacy window",
+            EXTERNAL_LINK_ID > LEGACY_EXTERNAL_LINK_RANGE
+        )
+    }
+
+    private fun deleteExternalLink() {
+        targetContext.contentResolver.delete(
+            ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS,
+            "${ProviderTableMeta._ID} = ?",
+            arrayOf(EXTERNAL_LINK_ID.toString())
+        )
+    }
+
     companion object {
+        // kept in sync with DrawerActivity, where both values are private
+        private const val MENU_ITEM_EXTERNAL_LINK = 111
+        private const val LEGACY_EXTERNAL_LINK_RANGE = 100
+
+        private const val EXTERNAL_LINK_ID = 501
+        private const val EXTERNAL_LINK_NAME = "High ID Test"
+        private const val EXTERNAL_LINK_URL = "https://nextcloud.com"
+
         private var account1: Account? = null
         private var user1: User? = null
         private var account2: Account? = null

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -665,9 +665,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
             intent.setAction(FileDisplayActivity.LIST_GROUPFOLDERS);
             startActivity(intent);
         } else {
-            if (menuItem.getItemId() >= MENU_ITEM_EXTERNAL_LINK &&
-                menuItem.getItemId() <= MENU_ITEM_EXTERNAL_LINK + 100) {
-                // external link clicked
+            if (menuItem.getGroupId() == R.id.drawer_menu_external_links) {
                 externalLinkClicked(menuItem);
             } else {
                 Log_OC.w(TAG, "Unknown drawer menu item clicked: " + menuItem.getTitle());
@@ -814,31 +812,36 @@ public void accountClicked(User user) {
     }
 
     private void externalLinkClicked(MenuItem menuItem) {
-        externalLinksProvider.getExternalLink(ExternalLinkType.LINK, externalLinks -> {
-            for (ExternalLink link : externalLinks) {
-                final var menuTitle = menuItem.getTitle();
-                if (menuTitle == null) {
-                    continue;
-                }
+        int linkId = menuItem.getItemId() - MENU_ITEM_EXTERNAL_LINK;
 
-                if (!menuTitle.toString().equalsIgnoreCase(link.getName())) {
-                    continue;
-                }
+        externalLinksProvider.getExternalLink(ExternalLinkType.LINK, externalLinks -> {
+            ExternalLink link = externalLinks.stream()
+                .filter(candidate -> candidate.getId() == linkId)
+                .findFirst()
+                .orElse(null);
 
-                if (link.getRedirect()) {
-                    IntentUtil.startLinkIntent(DrawerActivity.this, link.getUrl());
-                } else {
-                    Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
-                    externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, link.getName());
-                    externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, link.getUrl());
-                    externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, true);
-                    startActivity(externalWebViewIntent);
-                }
+            if (link == null) {
+                Log_OC.w(TAG, "No external link found for menu item: " + menuItem.getTitle());
+            } else {
+                openExternalLink(link);
             }
             return Unit.INSTANCE;
         });
     }
 
+    private void openExternalLink(ExternalLink link) {
+        if (link.getRedirect()) {
+            IntentUtil.startLinkIntent(this, link.getUrl());
+            return;
+        }
+
+        Intent intent = new Intent(getApplicationContext(), ExternalSiteWebView.class)
+            .putExtra(ExternalSiteWebView.EXTRA_TITLE, link.getName())
+            .putExtra(ExternalSiteWebView.EXTRA_URL, link.getUrl())
+            .putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, true);
+        startActivity(intent);
+    }
+
     /**
      * checks if the drawer exists and is opened.
      *