Merge pull request #14497 from nextcloud/feature/open-in-notes

Tighter integration - Open in Notes Button

Author: tobiasKaminsky

app/schemas/com.nextcloud.client.database.NextcloudDatabase/87.json

@@ -69,7 +69,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 82, to = 83),
         AutoMigration(from = 83, to = 84),
         AutoMigration(from = 84, to = 85, spec = DatabaseMigrationUtil.DeleteColumnSpec::class),
-        AutoMigration(from = 85, to = 86, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 85, to = 86, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 86, to = 87, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -136,5 +136,7 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT)
     val filesDownloadLimitDefault: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_RECOMMENDATION)
-    val recommendation: Int?
+    val recommendation: Int?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH)
+    val notesFolderPath: String?
 )

app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt

@@ -0,0 +1,73 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 ZetaTom <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.nextcloud.client.account.User
+import com.owncloud.android.ui.activity.FileDisplayActivity
+import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
+
+object LinkHelper {
+    const val APP_NEXTCLOUD_NOTES = "it.niedermann.owncloud.notes"
+    const val APP_NEXTCLOUD_TALK = "com.nextcloud.talk2"
+
+    /**
+     * Open specified app and, if not installed redirect to corresponding download.
+     *
+     * @param packageName of app to be opened
+     * @param user to pass in intent
+     */
+    fun openAppOrStore(packageName: String, user: Optional<User>, context: Context) {
+        openAppOrStore(packageName, user.getOrNull(), context)
+    }
+
+    /**
+     * Open specified app and, if not installed redirect to corresponding download.
+     *
+     * @param packageName of app to be opened
+     * @param user to pass in intent
+     */
+    fun openAppOrStore(packageName: String, user: User?, context: Context) {
+        val intent = context.packageManager.getLaunchIntentForPackage(packageName)
+        if (intent != null) {
+            // app installed - open directly
+            // TODO handle null user?
+            intent.putExtra(FileDisplayActivity.KEY_ACCOUNT, user.hashCode())
+            context.startActivity(intent)
+        } else {
+            // app not found - open market (Google Play Store, F-Droid, etc.)
+            openAppStore(packageName, false, context)
+        }
+    }
+
+    /**
+     * Open app store page of specified app or search for specified string. Will attempt to open browser when no app
+     * store is available.
+     *
+     * @param string packageName or url-encoded search string
+     * @param search false -> show app corresponding to packageName; true -> open search for string
+     */
+    fun openAppStore(string: String, search: Boolean = false, context: Context) {
+        var suffix = (if (search) "search?q=" else "details?id=") + string
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://$suffix"))
+        try {
+            context.startActivity(intent)
+        } catch (activityNotFoundException1: ActivityNotFoundException) {
+            // all is lost: open google play store web page for app
+            if (!search) {
+                suffix = "apps/$suffix"
+            }
+            intent.setData(Uri.parse("https://play.google.com/store/$suffix"))
+            context.startActivity(intent)
+        }
+    }
+}

app/src/main/java/com/nextcloud/utils/LinkHelper.kt

@@ -2315,6 +2315,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab
 
         contentValues.put(ProviderTableMeta.CAPABILITIES_RECOMMENDATION, capability.getRecommendations().getValue());
 
+        contentValues.put(ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH, capability.getNotesFolderPath());
+
         return contentValues;
     }
 
@@ -2490,7 +2492,10 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
             capability.setForbiddenFilenameBaseNamesJson(getString(cursor, ProviderTableMeta.CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_BASE_NAMES));
             capability.setFilesDownloadLimit(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT));
             capability.setFilesDownloadLimitDefault(getInt(cursor, ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT));
+
             capability.setRecommendations(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_RECOMMENDATION));
+
+            capability.setNotesFolderPath(getString(cursor, ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH));
         }
 
         return capability;

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -25,7 +25,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 86;
+    public static final int DB_VERSION = 87;
 
     private ProviderMeta() {
         // No instance
@@ -272,6 +272,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_BASE_NAMES = "forbidden_filename_basenames";
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT = "files_download_limit";
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT = "files_download_limit_default";
+        public static final String CAPABILITIES_NOTES_FOLDER_PATH = "notes_folder_path";
 
         //Columns of Uploads table
         public static final String UPLOADS_LOCAL_PATH = "local_path";

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -60,6 +60,7 @@
 import com.nextcloud.ui.ChooseAccountDialogFragment;
 import com.nextcloud.ui.composeActivity.ComposeActivity;
 import com.nextcloud.ui.composeActivity.ComposeDestination;
+import com.nextcloud.utils.LinkHelper;
 import com.nextcloud.utils.extensions.ViewExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.MainApp;
@@ -425,9 +426,9 @@ private void showTopBanner(LinearLayout banner, int primaryColor) {
         LinearLayout moreView = banner.findViewById(R.id.drawer_ecosystem_more);
         LinearLayout assistantView = banner.findViewById(R.id.drawer_ecosystem_assistant);
 
-        notesView.setOnClickListener(v -> openAppOrStore("it.niedermann.owncloud.notes"));
-        talkView.setOnClickListener(v -> openAppOrStore("com.nextcloud.talk2"));
-        moreView.setOnClickListener(v -> openAppStore("Nextcloud", true));
+        notesView.setOnClickListener(v -> LinkHelper.INSTANCE.openAppOrStore(LinkHelper.APP_NEXTCLOUD_NOTES, getUser(), this));
+        talkView.setOnClickListener(v -> LinkHelper.INSTANCE.openAppOrStore(LinkHelper.APP_NEXTCLOUD_TALK, getUser(), this));
+        moreView.setOnClickListener(v -> LinkHelper.INSTANCE.openAppStore("Nextcloud", true, this));
         assistantView.setOnClickListener(v -> {
             DrawerActivity.menuItemId = Menu.NONE;
             startComposeActivity(ComposeDestination.AssistantScreen, R.string.assistant_screen_top_bar_title);
@@ -459,45 +460,6 @@ private void showTopBanner(LinearLayout banner, int primaryColor) {
         banner.setVisibility(View.VISIBLE);
     }
 
-    /**
-     * Open specified app and, if not installed redirect to corresponding download.
-     *
-     * @param packageName of app to be opened
-     */
-    private void openAppOrStore(String packageName) {
-        Intent intent = getPackageManager().getLaunchIntentForPackage(packageName);
-        if (intent != null) {
-            // app installed - open directly
-            intent.putExtra(FileDisplayActivity.KEY_ACCOUNT, getUser().get().hashCode());
-            startActivity(intent);
-        } else {
-            // app not found - open market (Google Play Store, F-Droid, etc.)
-            openAppStore(packageName, false);
-        }
-    }
-
-    /**
-     * Open app store page of specified app or search for specified string. Will attempt to open browser when no app
-     * store is available.
-     *
-     * @param string packageName or url-encoded search string
-     * @param search false -> show app corresponding to packageName; true -> open search for string
-     */
-    private void openAppStore(String string, boolean search) {
-        String suffix = (search ? "search?q=" : "details?id=") + string;
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://" + suffix));
-        try {
-            startActivity(intent);
-        } catch (android.content.ActivityNotFoundException activityNotFoundException1) {
-            // all is lost: open google play store web page for app
-            if (!search) {
-                suffix = "apps/" + suffix;
-            }
-            intent.setData(Uri.parse("https://play.google.com/store/" + suffix));
-            startActivity(intent);
-        }
-    }
-
     private void setDrawerHeaderLogo(Drawable drawable, String serverName) {
         ImageView imageHeader = mNavigationViewHeader.findViewById(R.id.drawer_header_logo);
         imageHeader.setImageDrawable(drawable);
@@ -1357,7 +1319,7 @@ protected void handleDeepLink(@NonNull Uri uri) {
                 findViewById(R.id.fab_main).callOnClick();
                 break;
             case ACTION_APP_UPDATE:
-                openAppStore(getPackageName(), false);
+                LinkHelper.INSTANCE.openAppStore(getPackageName(), false, this);
                 break;
             case OPEN_NOTIFICATIONS:
                 startActivity(NotificationsActivity.class);

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

@@ -39,6 +39,7 @@
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.model.OCFileFilterType;
 import com.nextcloud.model.OfflineOperationType;
+import com.nextcloud.utils.LinkHelper;
 import com.nextcloud.utils.extensions.ViewExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.MainApp;
@@ -64,6 +65,7 @@
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.shares.ShareeUser;
+import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.tags.Tag;
 import com.owncloud.android.operations.RefreshFolderOperation;
 import com.owncloud.android.operations.RemoteOperationFailedException;
@@ -77,6 +79,7 @@
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
+import com.owncloud.android.utils.theme.CapabilityUtils;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
 import java.io.File;
@@ -111,6 +114,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private final String userId;
     private final Activity activity;
     private final AppPreferences preferences;
+    private final OCCapability capability;
     private List<OCFile> mFiles = new ArrayList<>();
     private final List<OCFile> mFilesAll = new ArrayList<>();
     private final boolean hideItemOptions;
@@ -121,7 +125,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private User user;
     private final OCFileListFragmentInterface ocFileListFragmentInterface;
 
-
     private OCFile currentDirectory;
     private static final String TAG = OCFileListAdapter.class.getSimpleName();
 
@@ -163,6 +166,7 @@ public OCFileListAdapter(
         hideItemOptions = argHideItemOptions;
         this.gridView = gridView;
         mStorageManager = transferServiceGetter.getStorageManager();
+        this.capability = CapabilityUtils.getCapability(user, activity);
 
         if (activity instanceof FileDisplayActivity) {
             ((FileDisplayActivity) activity).showSortListGroup(true);
@@ -429,23 +433,45 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             footerViewHolder.getLoadingProgressBar().setVisibility(
                 ocFileListFragmentInterface.isLoading() ? View.VISIBLE : View.GONE);
         } else if (holder instanceof OCFileListHeaderViewHolder headerViewHolder) {
+            ListHeaderBinding headerBinding = headerViewHolder.getBinding();
+            headerViewHolder.getHeaderView().setOnClickListener(v -> ocFileListFragmentInterface.onHeaderClicked());
+
             String text = currentDirectory.getRichWorkspace();
             PreviewTextFragment.setText(headerViewHolder.getHeaderText(), text, null, activity, true, true, viewThemeUtils);
-            headerViewHolder.getHeaderView().setOnClickListener(v -> ocFileListFragmentInterface.onHeaderClicked());
 
-            ViewExtensionsKt.setVisibleIf(headerViewHolder.getBinding().recommendedFilesRecyclerView, shouldShowRecommendedFiles());
-            ViewExtensionsKt.setVisibleIf(headerViewHolder.getBinding().recommendedFilesTitle, shouldShowRecommendedFiles());
-            ViewExtensionsKt.setVisibleIf(headerViewHolder.getBinding().allFilesTitle, shouldShowRecommendedFiles());
+            // hide header text if empty (server returns NBSP)
+            ViewExtensionsKt.setVisibleIf(headerViewHolder.getHeaderText(), text != null && !text.isBlank() && !" ".equals(text));
+
+            ViewExtensionsKt.setVisibleIf(headerBinding.recommendedFilesRecyclerView, shouldShowRecommendedFiles());
+            ViewExtensionsKt.setVisibleIf(headerBinding.recommendedFilesTitle, shouldShowRecommendedFiles());
+            ViewExtensionsKt.setVisibleIf(headerBinding.allFilesTitle, shouldShowRecommendedFiles());
 
             if (shouldShowRecommendedFiles()) {
-                final var recommendedFilesRecyclerView = headerViewHolder.getBinding().recommendedFilesRecyclerView;
+                final var recommendedFilesRecyclerView = headerBinding.recommendedFilesRecyclerView;
 
                 final LinearLayoutManager layoutManager = new LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false);
                 recommendedFilesRecyclerView.setLayoutManager(layoutManager);
 
                 final var adapter = new RecommendedFilesAdapter(recommendedFiles, ocFileListDelegate, this, mStorageManager);
                 recommendedFilesRecyclerView.setAdapter(adapter);
             }
+
+            ViewExtensionsKt.setVisibleIf(headerBinding.openIn.getRoot(), shouldShowOpenInNotes());
+
+            if (shouldShowOpenInNotes()) {
+                final var listHeaderOpenInBinding = headerBinding.openIn;
+
+                viewThemeUtils.files.themeFilledCardView(listHeaderOpenInBinding.infoCard);
+
+                listHeaderOpenInBinding.infoText.setText(String.format(activity.getString(R.string.folder_best_viewed_in),
+                                                                       activity.getString(R.string.ecosystem_apps_notes)));
+
+                listHeaderOpenInBinding.openInButton.setText(String.format(activity.getString(R.string.open_in_app),
+                                                                           activity.getString(R.string.ecosystem_apps_display_notes)));
+
+                listHeaderOpenInBinding.openInButton.setOnClickListener(v -> LinkHelper.INSTANCE.openAppOrStore(LinkHelper.APP_NEXTCLOUD_NOTES, user, activity));
+            }
+
         } else {
             ListViewHolder gridViewHolder = (ListViewHolder) holder;
             OCFile file = getItem(position);
@@ -481,6 +507,12 @@ private boolean shouldShowRecommendedFiles() {
         return !recommendedFiles.isEmpty() && currentDirectory.isRootDirectory();
     }
 
+    private boolean shouldShowOpenInNotes() {
+        String notesFolderPath = capability.getNotesFolderPath();
+        String currentPath = currentDirectory.getDecryptedRemotePath();
+        return notesFolderPath != null && currentPath != null && currentPath.startsWith(notesFolderPath);
+    }
+
     private void checkVisibilityOfFileFeaturesLayout(ListViewHolder holder) {
         int fileFeaturesVisibility = View.GONE;
         LinearLayout fileFeaturesLayout = holder.getFileFeaturesLayout();
@@ -758,6 +790,10 @@ public boolean shouldShowHeader() {
             return true;
         }
 
+        if (shouldShowOpenInNotes()) {
+            return true;
+        }
+
         if (currentDirectory.getRichWorkspace() == null) {
             return false;
         }

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -220,6 +220,23 @@ class FilesSpecificViewThemeUtils @Inject constructor(
         }
     }
 
+    fun themeFilledCardView(cardView: MaterialCardView) {
+        withScheme(cardView) { scheme ->
+            val background = cardView.context.getColor(R.color.grey_200)
+            cardView.backgroundTintList =
+                ColorStateList(
+                    arrayOf(
+                        intArrayOf(android.R.attr.state_checked),
+                        intArrayOf(-android.R.attr.state_checked)
+                    ),
+                    intArrayOf(
+                        scheme.secondaryContainer,
+                        background
+                    )
+                )
+        }
+    }
+
     fun themeAvatarButton(shareImageView: ImageView) {
         withScheme(shareImageView.context) { scheme ->
             shareImageView.background.setColorFilter(scheme.primary, PorterDuff.Mode.SRC_IN)