From 8c5e87f73ad224029a6dfb3847382754af985f94 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 10:15:36 +0100
Subject: [PATCH 001/138] add layout

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../main/res/drawable-night/round_bgnd.xml    |  11 ++
 .../res/drawable-night/shared_via_link.xml    |  16 +++
 app/src/main/res/drawable/divider.xml         |  19 +++
 .../ic_baseline_arrow_drop_down_24.xml        |  16 +++
 app/src/main/res/drawable/ic_contact_book.xml |  16 +++
 app/src/main/res/drawable/ic_content_copy.xml |  13 ++
 .../main/res/drawable/ic_dots_vertical.xml    |  15 +++
 app/src/main/res/drawable/round_bgnd.xml      |  11 ++
 app/src/main/res/drawable/shared_via_link.xml |  16 +++
 .../main/res/layout/fragment_note_share.xml   | 124 ++++++++++++++++++
 .../res/layout/fragment_note_share_item.xml   | 100 ++++++++++++++
 app/src/main/res/values/dimens.xml            |   9 ++
 app/src/main/res/values/strings.xml           |   9 ++
 app/src/main/res/values/styles.xml            |   5 +
 14 files changed, 380 insertions(+)
 create mode 100644 app/src/main/res/drawable-night/round_bgnd.xml
 create mode 100644 app/src/main/res/drawable-night/shared_via_link.xml
 create mode 100644 app/src/main/res/drawable/divider.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
 create mode 100644 app/src/main/res/drawable/ic_contact_book.xml
 create mode 100644 app/src/main/res/drawable/ic_content_copy.xml
 create mode 100644 app/src/main/res/drawable/ic_dots_vertical.xml
 create mode 100644 app/src/main/res/drawable/round_bgnd.xml
 create mode 100644 app/src/main/res/drawable/shared_via_link.xml
 create mode 100644 app/src/main/res/layout/fragment_note_share.xml
 create mode 100644 app/src/main/res/layout/fragment_note_share_item.xml

diff --git a/app/src/main/res/drawable-night/round_bgnd.xml b/app/src/main/res/drawable-night/round_bgnd.xml
new file mode 100644
index 000000000..44d973897
--- /dev/null
+++ b/app/src/main/res/drawable-night/round_bgnd.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#222222" />
+</shape>
diff --git a/app/src/main/res/drawable-night/shared_via_link.xml b/app/src/main/res/drawable-night/shared_via_link.xml
new file mode 100644
index 000000000..bd1841046
--- /dev/null
+++ b/app/src/main/res/drawable-night/shared_via_link.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 000000000..b2172e676
--- /dev/null
+++ b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="0dp"
+        android:left="72dp"
+        android:right="0dp"
+        android:top="0dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/widget_foreground" />
+            <size android:height="1dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
new file mode 100644
index 000000000..5aee27252
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,600L280,400L680,400L480,600Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_contact_book.xml b/app/src/main/res/drawable/ic_contact_book.xml
new file mode 100644
index 000000000..1ca1a2799
--- /dev/null
+++ b/app/src/main/res/drawable/ic_contact_book.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#666666"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
new file mode 100644
index 000000000..a2b6c8e58
--- /dev/null
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -0,0 +1,13 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#757575" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_dots_vertical.xml b/app/src/main/res/drawable/ic_dots_vertical.xml
new file mode 100644
index 000000000..5c2616239
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dots_vertical.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"
+      android:fillColor="#666666"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_bgnd.xml b/app/src/main/res/drawable/round_bgnd.xml
new file mode 100644
index 000000000..8c21e85d5
--- /dev/null
+++ b/app/src/main/res/drawable/round_bgnd.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#ffffff" />
+</shape>
diff --git a/app/src/main/res/drawable/shared_via_link.xml b/app/src/main/res/drawable/shared_via_link.xml
new file mode 100644
index 000000000..d5ca0a47e
--- /dev/null
+++ b/app/src/main/res/drawable/shared_via_link.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FF000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_note_share.xml b/app/src/main/res/layout/fragment_note_share.xml
new file mode 100644
index 000000000..4cb469afc
--- /dev/null
+++ b/app/src/main/res/layout/fragment_note_share.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/shareContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/spacer_1hx">
+
+    <LinearLayout
+        android:id="@+id/search_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/zero">
+
+        <ImageView
+            android:id="@+id/searchViewIcon"
+            android:layout_width="@dimen/default_icon_size"
+            android:layout_height="@dimen/default_icon_size"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:padding="@dimen/spacer_1x"
+            android:src="@drawable/ic_search_grey600_24dp" />
+
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/searchView"
+            style="@style/nextcloud.SearchView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/spacer_1hx"
+            android:layout_weight="1"
+            android:hint="@string/note_share_fragment_search_text"
+            app:searchIcon="@null" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/pick_contact_email_btn"
+            android:layout_width="@dimen/minimum_size_for_touchable_area"
+            android:layout_height="@dimen/minimum_size_for_touchable_area"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/spacer_1hx"
+            android:contentDescription="@string/note_share_fragment_contact_icon_content_description"
+            android:padding="12dp"
+            android:src="@drawable/ic_contact_book" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/shared_with_you_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/spacer_1x"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_2x"
+        android:paddingRight="@dimen/spacer_2x">
+
+        <ImageView
+            android:id="@+id/shared_with_you_avatar"
+            android:layout_width="@dimen/default_icon_size"
+            android:layout_height="@dimen/default_icon_size"
+            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:src="@drawable/ic_account_circle_grey_24dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingTop="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_2x">
+
+            <TextView
+                android:id="@+id/shared_with_you_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/note_share_fragment_shared_with_you"
+                android:textSize="@dimen/note_font_size_small" />
+
+            <LinearLayout
+                android:id="@+id/shared_with_you_note_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingTop="@dimen/spacer_1x"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:contentDescription="@string/note_share_fragment_icon_content_description"
+                    android:src="@drawable/ic_notes" />
+
+                <TextView
+                    android:id="@+id/shared_with_you_note"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:paddingStart="@dimen/spacer_1x"
+                    android:paddingEnd="@dimen/spacer_1x"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/sharesList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@drawable/divider"
+        android:dividerHeight="1dp"
+        tools:listitem="@layout/fragment_note_share_item" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_note_share_item.xml b/app/src/main/res/layout/fragment_note_share_item.xml
new file mode 100644
index 000000000..d76546069
--- /dev/null
+++ b/app/src/main/res/layout/fragment_note_share_item.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/share_by_link_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/sharee_list_item_size"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:background="@drawable/round_bgnd"
+        android:contentDescription="@string/note_share_fragment_icon_content_description"
+        android:padding="@dimen/spacer_1x"
+        android:src="@drawable/shared_via_link" />
+
+    <LinearLayout
+        android:id="@+id/share_name_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="@string/note_share_fragment_share_link"
+            android:textColor="@color/fg_default_selection"
+            android:textSize="@dimen/note_font_size_small" />
+
+        <TextView
+            android:id="@+id/subline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:singleLine="true"
+            tools:text="5 downloads remaining"
+            tools:visibility="visible"
+            android:textColor="@color/fg_default_selection"
+            android:textSize="@dimen/note_font_size_small" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/permission_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            tools:text="View only"
+            app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:drawableTint="@color/primary"
+            app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            android:textColor="@color/primary"
+            android:textSize="@dimen/note_font_size_minimum" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/copy_link"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/note_share_fragment_copy_icon_content_description"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1hx"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1hx"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_content_copy" />
+
+    <ImageView
+        android:id="@+id/overflow_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:src="@drawable/ic_dots_vertical" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5daaa6b03..55c8ef8d7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,6 +9,8 @@
   ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <resources>
+    <dimen name="zero">0dp</dimen>
+
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="spacer_1qx">2dp</dimen>
     <dimen name="spacer_1hx">4dp</dimen>
@@ -22,6 +24,8 @@
 
     <dimen name="spacer_activity_sides">0dp</dimen>
 
+    <dimen name="default_icon_size">40dp</dimen>
+
     <!-- Drawer header -->
     <dimen name="drawer_header_height">100dp</dimen>
     <dimen name="drawer_header_logo_size">42dp</dimen>
@@ -33,6 +37,7 @@
     <dimen name="secondary_font_size">14sp</dimen>
 
     <!-- Font Sizes -->
+    <dimen name="note_font_size_minimum">12sp</dimen>
     <dimen name="note_font_size_small">16sp</dimen>
     <dimen name="note_font_size_medium">18sp</dimen>
     <dimen name="note_font_size_large">22sp</dimen>
@@ -48,4 +53,8 @@
     <dimen name="widget_note_list_inner_padding">4dp</dimen>
     <dimen name="widget_note_list_fav_icon_width">26dp</dimen>
     <dimen name="widget_note_list_fav_icon_height">20dp</dimen>
+
+    <dimen name="minimum_size_for_touchable_area">48dp</dimen>
+
+    <dimen name="sharee_list_item_size">56dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b596e5f7d..9984a4779 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,15 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
+    <string name="note_share_fragment_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
+    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_fragment_share_link">Share link</string>
+
     <string name="listview_updated_today">Today</string>
     <string name="listview_updated_yesterday">Yesterday</string>
     <string name="listview_updated_this_week">This week</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 36c07e913..837f6c4ca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -64,6 +64,11 @@
         <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
     </style>
 
+    <style name="nextcloud.SearchView" parent="Widget.AppCompat.SearchView">
+        <item name="closeIcon">@drawable/ic_clear_grey_24dp</item>
+        <item name="searchIcon">@drawable/ic_search_grey600_24dp</item>
+    </style>
+
     <style name="tabStyle" parent="Widget.Material3.TabLayout">
         <item name="backgroundColor">@android:color/transparent</item>
         <item name="itemBackground">@android:color/transparent</item>

From f7acd887d0956036cebc79f58557c6cc3bfb5c9d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 10:54:03 +0100
Subject: [PATCH 002/138] add fragment

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        | 597 ++++++++++++++++++
 .../util/extensions/BundleExtensions.kt       |  54 ++
 2 files changed, 651 insertions(+)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/BundleExtensions.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
new file mode 100644
index 000000000..bfdf7a27b
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -0,0 +1,597 @@
+package it.niedermann.owncloud.notes.share;
+
+import android.Manifest;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
+
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
+        DisplayUtils.AvatarGenerationListener,
+        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+
+    private static final String TAG = "NoteShareFragment";
+    private static final String ARG_NOTE = "NOTE";
+    private static final String ARG_ACCOUNT = "ACCOUNT";
+
+    private FragmentNoteShareBinding binding;
+    private Note note;
+    private Account account;
+
+    private OnEditShareListener onEditShareListener;
+
+    public static NoteShareFragment newInstance(Note note, Account account) {
+        NoteShareFragment fragment = new NoteShareFragment();
+        Bundle args = new Bundle();
+        args.putSerializable(ARG_NOTE, note);
+        args.putSerializable(ARG_ACCOUNT, account);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
+            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
+        } else {
+            Bundle arguments = getArguments();
+            if (arguments != null) {
+                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
+                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
+            }
+        }
+
+        if (note == null) {
+            throw new IllegalArgumentException("Note cannot be null");
+        }
+
+        if (account == null) {
+            throw new IllegalArgumentException("Account cannot be null");
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        refreshCapabilitiesFromDB();
+        refreshSharesFromDB();
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
+
+        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+                new ArrayList<>(),
+                this,
+                account,
+                note));
+
+        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
+
+        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+
+        setupView();
+
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            onEditShareListener = (OnEditShareListener) context;
+        } catch (Exception ignored) {
+            throw new IllegalArgumentException("Calling activity must implement the interface", ignored);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        searchConfig.reset();
+    }
+
+    private void setupView() {
+        setShareWithYou();
+
+        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        FileDetailSharingFragmentHelper.setupSearchView(
+                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
+                binding.searchView,
+                fileActivity.getComponentName());
+        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+
+
+        if (file.canReshare()) {
+            if (file.isEncrypted() || (parentFile != null && parentFile.isEncrypted())) {
+                if (file.getE2eCounter() == -1) {
+                    // V1 cannot share
+                    binding.searchContainer.setVisibility(View.GONE);
+                } else {
+                    binding.searchView.setQueryHint(getResources().getString(R.string.secure_share_search));
+
+                    if (file.isSharedViaLink()) {
+                        binding.searchView.setQueryHint(getResources().getString(R.string.share_not_allowed_when_file_drop));
+                        binding.searchView.setInputType(InputType.TYPE_NULL);
+                        disableSearchView(binding.searchView);
+                    }
+                }
+            } else {
+                binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
+            }
+        } else {
+            binding.searchView.setQueryHint(getResources().getString(R.string.resharing_is_not_allowed));
+            binding.searchView.setInputType(InputType.TYPE_NULL);
+            binding.pickContactEmailBtn.setVisibility(View.GONE);
+            disableSearchView(binding.searchView);
+        }
+
+        checkShareViaUser();
+    }
+
+    private void checkShareViaUser() {
+        if (!MDMConfig.INSTANCE.shareViaUser(requireContext())) {
+            binding.searchContainer.setVisibility(View.GONE);
+        }
+    }
+
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    private void setShareWithYou() {
+        if (accountManager.userOwnsFile(file, user)) {
+            binding.sharedWithYouContainer.setVisibility(View.GONE);
+        } else {
+            binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.shared_with_you_by), file.getOwnerDisplayName()));
+            DisplayUtils.setAvatar(user,
+                    file.getOwnerId(),
+                    this,
+                    getResources().getDimension(
+                            R.dimen.file_list_item_avatar_icon_radius),
+                    getResources(),
+                    binding.sharedWithYouAvatar,
+                    getContext());
+            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+
+            String note = file.getNote();
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(file.getNote());
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    @Override
+    public void copyInternalLink() {
+        OwnCloudAccount account = accountManager.getCurrentOwnCloudAccount();
+
+        if (account == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_url));
+            return;
+        }
+
+        FileDisplayActivity.showShareLinkDialog(fileActivity, file, createInternalLink(account, file));
+    }
+
+    private String createInternalLink(OwnCloudAccount account, OCFile file) {
+        return account.getBaseUri() + "/index.php/f/" + file.getLocalId();
+    }
+
+    @Override
+    public void createPublicShareLink() {
+        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // create without password if not enforced by server or we don't know if enforced;
+            fileOperationsHelper.shareFileViaPublicShare(file, null);
+        }
+    }
+
+    @Override
+    public void createSecureFileDrop() {
+        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    }
+
+    private void showSendLinkTo(OCShare publicShare) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(publicShare.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                FileDisplayActivity.showShareLinkDialog(fileActivity, file, publicShare.getShareLink());
+            }
+        }
+    }
+
+    public void copyLink(OCShare share) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(share.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+            }
+        }
+    }
+
+    /**
+     * show share action bottom sheet
+     *
+     * @param share
+     */
+    @Override
+    @VisibleForTesting
+    public void showSharingMenuActionSheet(OCShare share) {
+        if (fileActivity != null && !fileActivity.isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        }
+    }
+
+    /**
+     * show quick sharing permission dialog
+     *
+     * @param share
+     */
+    @Override
+    public void showPermissionsDialog(OCShare share) {
+        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @param file   the edited {@link OCFile}
+     * @see #onUpdateShareInformation(RemoteOperationResult)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
+        this.file = file;
+
+        onUpdateShareInformation(result);
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
+     * OCFile held by this fragment}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            refreshUiFromDB();
+        } else {
+            setupView();
+        }
+    }
+
+    /**
+     * Get {@link OCShare} instance from DB and updates the UI.
+     */
+    private void refreshUiFromDB() {
+        refreshSharesFromDB();
+        // Updates UI with new state
+        setupView();
+    }
+
+    private void unshareWith(OCShare share) {
+        fileOperationsHelper.unshareShare(file, share);
+    }
+
+    /**
+     * Starts a dialog that requests a password to the user to protect a share link.
+     *
+     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
+     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
+     * @param askForPassword if true, password is optional
+     */
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+                createShare,
+                askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void requestPasswordForShare(OCShare share, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void showProfileBottomSheet(User user, String shareWith) {
+        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
+            new RetrieveHoverCardAsyncTask(user,
+                    shareWith,
+                    fileActivity,
+                    clientFactory,
+                    viewThemeUtils).execute();
+        }
+    }
+
+    /**
+     * Get known server capabilities from DB
+     */
+    public void refreshCapabilitiesFromDB() {
+        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+    }
+
+    /**
+     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
+     * before reading database.
+     */
+    public void refreshSharesFromDB() {
+        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
+        if (newFile != null) {
+            file = newFile;
+        }
+
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            return;
+        }
+        adapter.getShares().clear();
+
+        // to show share with users/groups info
+        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
+                user.getAccountName());
+
+        adapter.addShares(shares);
+
+        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
+            return;
+        }
+
+        // Get public share
+        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
+                ShareType.PUBLIC_LINK,
+                "");
+
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
+                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+            final OCShare ocShare = new OCShare();
+            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+            publicShares.add(ocShare);
+        } else {
+            adapter.removeNewPublicShare();
+        }
+
+        adapter.addShares(publicShares);
+    }
+
+    private void checkContactPermission() {
+        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+            pickContactEmail();
+        } else {
+            requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
+        }
+    }
+
+    private void pickContactEmail() {
+        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
+
+        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
+            onContactSelectionResultLauncher.launch(intent);
+        } else {
+            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+        }
+    }
+
+    private void handleContactResult(@NonNull Uri contactUri) {
+        // Define the projection to get all email addresses.
+        String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
+
+        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                // The contact has only one email address, use it.
+                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
+                if (columnIndex != -1) {
+                    // Use the email address as needed.
+                    // email variable contains the selected contact's email address.
+                    String email = cursor.getString(columnIndex);
+                    binding.searchView.post(() -> {
+                        binding.searchView.setQuery(email, false);
+                        binding.searchView.requestFocus();
+                    });
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
+                }
+            } else {
+                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
+            }
+            cursor.close();
+        } else {
+            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
+        }
+    }
+
+    private boolean containsNoNewPublicShare(List<OCShare> shares) {
+        for (OCShare share : shares) {
+            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        FileExtensionsKt.logFileSize(file, TAG);
+        outState.putParcelable(ARG_NOTE, file);
+        outState.putParcelable(ARG_USER, user);
+    }
+
+    @Override
+    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
+        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
+    }
+
+    @Override
+    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
+        return false;
+    }
+
+    private boolean isReshareForbidden(OCShare share) {
+        return ShareType.FEDERATED == share.getShareType() ||
+                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+    }
+
+    @VisibleForTesting
+    public void search(String query) {
+        SearchView searchView = requireView().findViewById(R.id.searchView);
+        searchView.setQuery(query, true);
+    }
+
+    @Override
+    public void advancedPermissions(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+    }
+
+
+    @Override
+    public void sendNewEmail(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+    }
+
+    @Override
+    public void unShare(OCShare share) {
+        unshareWith(share);
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            return;
+        }
+        adapter.remove(share);
+    }
+
+    @Override
+    public void sendLink(OCShare share) {
+        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
+            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
+        } else {
+            showSendLinkTo(share);
+        }
+    }
+
+    @Override
+    public void addAnotherLink(OCShare share) {
+        createPublicShareLink();
+    }
+
+    private void modifyExistingShare(OCShare share, int screenTypePermission) {
+        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
+                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+    }
+
+    @Override
+    public void onQuickPermissionChanged(OCShare share, int permission) {
+        fileOperationsHelper.setPermissionsToShare(share, permission);
+    }
+
+    //launcher for contact permission
+    private final ActivityResultLauncher<String> requestContactPermissionLauncher =
+            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+                if (isGranted) {
+                    pickContactEmail();
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                }
+            });
+
+    //launcher to handle contact selection
+    private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
+            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                    result -> {
+                        if (result.getResultCode() == Activity.RESULT_OK) {
+                            Intent intent = result.getData();
+                            if (intent == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            Uri contactUri = intent.getData();
+                            if (contactUri == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            handleContactResult(contactUri);
+
+                        }
+                    });
+
+    public interface OnEditShareListener {
+        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
+                               boolean isExpiryDateShown);
+
+        void onShareProcessClosed();
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/BundleExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/BundleExtensions.kt
new file mode 100644
index 000000000..9fb4c9e78
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/BundleExtensions.kt
@@ -0,0 +1,54 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.util.extensions
+
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import java.io.Serializable
+
+@Suppress("TopLevelPropertyNaming")
+
+fun <T : Serializable?> Bundle?.getSerializableArgument(key: String, type: Class<T>): T? {
+    if (this == null) {
+        return null
+    }
+
+    return try {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            this.getSerializable(key, type)
+        } else {
+            @Suppress("UNCHECKED_CAST", "DEPRECATION")
+            if (type.isInstance(this.getSerializable(key))) {
+                this.getSerializable(key) as T
+            } else {
+                null
+            }
+        }
+    } catch (e: ClassCastException) {
+        null
+    }
+}
+
+fun <T : Parcelable?> Bundle?.getParcelableArgument(key: String, type: Class<T>): T? {
+    if (this == null) {
+        return null
+    }
+
+    return try {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            this.getParcelable(key, type)
+        } else {
+            @Suppress("DEPRECATION")
+            this.getParcelable(key)
+        }
+    } catch (e: ClassCastException) {
+        e.printStackTrace()
+        null
+    }
+}

From 9f825a8d474bfd6428d83698f0286850e4e5be85 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 12:05:17 +0100
Subject: [PATCH 003/138] add some logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |   6 +-
 .../notes/persistence/CapabilitiesWorker.java |   1 +
 .../share/CreateShareViaLinkOperation.java    |  91 ++++++++++
 .../notes/share/NoteShareFragment.java        | 164 ++++++++++++------
 .../owncloud/notes/share/SyncOperation.java   |  37 ++++
 .../owncloud/notes/shared/server/Server.kt    |  40 +++++
 .../owncloud/notes/shared/user/User.kt        |  56 ++++++
 .../notes/shared/util/ClipboardUtil.kt        |  50 ++++++
 app/src/main/res/values/strings.xml           |   9 +
 9 files changed, 396 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt

diff --git a/app/build.gradle b/app/build.gradle
index 9113ca78b..79c211f4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,8 +95,12 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
+    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
+        exclude group: 'org.ogce', module: 'xpp3'
+    }
+
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
+    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java
index af5389061..8b0d22f40 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java
@@ -52,6 +52,7 @@ public Result doWork() {
         for (final var account : repo.getAccounts()) {
             try {
                 final var ssoAccount = AccountImporter.getSingleSignOnAccount(getApplicationContext(), account.getAccountName());
+
                 Log.i(TAG, "Refreshing capabilities for " + ssoAccount.name);
                 final var capabilities = CapabilitiesClient.getCapabilities(getApplicationContext(), ssoAccount, account.getCapabilitiesETag(), ApiProvider.getInstance());
                 repo.updateCapabilitiesETag(account.getId(), capabilities.getETag());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
new file mode 100644
index 000000000..509fce819
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
@@ -0,0 +1,91 @@
+package it.niedermann.owncloud.notes.share;
+
+import java.util.ArrayList;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+/**
+ * Creates a new public share for a given file
+ */
+public class CreateShareViaLinkOperation extends SyncOperation {
+
+    private final String path;
+    private final String password;
+    private int permissions = OCShare.NO_PERMISSION;
+
+    public CreateShareViaLinkOperation(String path, String password, User user) {
+        super(user);
+
+        this.path = path;
+        this.password = password;
+    }
+
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
+                ShareType.PUBLIC_LINK,
+                "",
+                false,
+                password,
+                permissions);
+        createOp.setGetShareDetails(true);
+        RemoteOperationResult result = createOp.execute(client);
+
+        if (result.isSuccess()) {
+            if (result.getData().size() > 0) {
+                Object item = result.getData().get(0);
+                if (item instanceof OCShare) {
+                    updateData((OCShare) item);
+                } else {
+                    ArrayList<Object> data = result.getData();
+                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+                    result.setData(data);
+                }
+            } else {
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+            }
+        }
+
+        return result;
+    }
+
+    private void updateData(OCShare share) {
+        // Update DB with the response
+        share.setPath(path);
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setFolder(true);
+        } else {
+            share.setFolder(false);
+        }
+
+        // TODO: Save share
+
+        /*
+        getStorageManager().saveShare(share);
+
+        // Update OCFile with data from share: ShareByLink  and publicLink
+        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
+        if (file != null) {
+            file.setSharedViaLink(true);
+            getStorageManager().saveFile(file);
+        }
+         */
+
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index bfdf7a27b..5f1004d38 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -1,7 +1,6 @@
 package it.niedermann.owncloud.notes.share;
 
 import android.Manifest;
-import android.accounts.AccountManager;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
@@ -23,15 +22,25 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.android.material.snackbar.Snackbar;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
 public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
@@ -41,18 +50,21 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
+    private static final String ARG_USER = "USER";
 
     private FragmentNoteShareBinding binding;
     private Note note;
+    private User user;
     private Account account;
 
     private OnEditShareListener onEditShareListener;
 
-    public static NoteShareFragment newInstance(Note note, Account account) {
+    public static NoteShareFragment newInstance(Note note, User user, Account account) {
         NoteShareFragment fragment = new NoteShareFragment();
         Bundle args = new Bundle();
         args.putSerializable(ARG_NOTE, note);
         args.putSerializable(ARG_ACCOUNT, account);
+        args.putParcelable(ARG_USER, user);
         fragment.setArguments(args);
         return fragment;
     }
@@ -64,11 +76,13 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
             account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
+            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
         } else {
             Bundle arguments = getArguments();
             if (arguments != null) {
                 note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
                 account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
+                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
             }
         }
 
@@ -76,7 +90,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             throw new IllegalArgumentException("Note cannot be null");
         }
 
-        if (account == null) {
+        if (user == null) {
             throw new IllegalArgumentException("Account cannot be null");
         }
     }
@@ -96,7 +110,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
                 new ArrayList<>(),
                 this,
-                account,
+                user,
                 note));
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
@@ -119,8 +133,8 @@ public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         try {
             onEditShareListener = (OnEditShareListener) context;
-        } catch (Exception ignored) {
-            throw new IllegalArgumentException("Calling activity must implement the interface", ignored);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Calling activity must implement the interface", e);
         }
     }
 
@@ -147,38 +161,14 @@ private void setupView() {
                 fileActivity.getComponentName());
         viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
-
         if (file.canReshare()) {
-            if (file.isEncrypted() || (parentFile != null && parentFile.isEncrypted())) {
-                if (file.getE2eCounter() == -1) {
-                    // V1 cannot share
-                    binding.searchContainer.setVisibility(View.GONE);
-                } else {
-                    binding.searchView.setQueryHint(getResources().getString(R.string.secure_share_search));
-
-                    if (file.isSharedViaLink()) {
-                        binding.searchView.setQueryHint(getResources().getString(R.string.share_not_allowed_when_file_drop));
-                        binding.searchView.setInputType(InputType.TYPE_NULL);
-                        disableSearchView(binding.searchView);
-                    }
-                }
-            } else {
-                binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
-            }
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
         } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.resharing_is_not_allowed));
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
             binding.searchView.setInputType(InputType.TYPE_NULL);
             binding.pickContactEmailBtn.setVisibility(View.GONE);
             disableSearchView(binding.searchView);
         }
-
-        checkShareViaUser();
-    }
-
-    private void checkShareViaUser() {
-        if (!MDMConfig.INSTANCE.shareViaUser(requireContext())) {
-            binding.searchContainer.setVisibility(View.GONE);
-        }
     }
 
     private void disableSearchView(View view) {
@@ -191,22 +181,36 @@ private void disableSearchView(View view) {
         }
     }
 
+    // TODO: Check if note.getAccountId() return note's owner's id
+    private boolean accountOwnsFile() {
+        String noteId = String.valueOf(note.getAccountId());
+        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+    }
+
     private void setShareWithYou() {
-        if (accountManager.userOwnsFile(file, user)) {
+        if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
         } else {
-            binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.shared_with_you_by), file.getOwnerDisplayName()));
-            DisplayUtils.setAvatar(user,
-                    file.getOwnerId(),
-                    this,
-                    getResources().getDimension(
-                            R.dimen.file_list_item_avatar_icon_radius),
-                    getResources(),
-                    binding.sharedWithYouAvatar,
-                    getContext());
+
+            /*
+            // TODO: How to get owner display name from note?
+
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
+
+
+            Glide.with(this)
+                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                    .error(R.drawable.ic_account_circle_grey_24dp)
+                    .apply(RequestOptions.circleCropTransform())
+                    .into(binding.sharedWithYouAvatar);
+
             binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
 
+            /*
+            // TODO: Note's note?
             String note = file.getNote();
 
             if (!TextUtils.isEmpty(note)) {
@@ -215,26 +219,42 @@ private void setShareWithYou() {
             } else {
                 binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
             }
+             */
         }
     }
 
-    @Override
-    public void copyInternalLink() {
-        OwnCloudAccount account = accountManager.getCurrentOwnCloudAccount();
-
+    private void copyInternalLink() {
         if (account == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_url));
+            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.sharesList)
+                    .show();
             return;
         }
 
-        FileDisplayActivity.showShareLinkDialog(fileActivity, file, createInternalLink(account, file));
+        showShareLinkDialog();
+    }
+
+    private void showShareLinkDialog() {
+        String link = createInternalLink();
+
+        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+
+        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+        intentToShareLink.setType("text/plain");
+        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
+
+        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
+        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
     }
 
-    private String createInternalLink(OwnCloudAccount account, OCFile file) {
-        return account.getBaseUri() + "/index.php/f/" + file.getLocalId();
+    // TODO: Check account.getUrl returning base url?
+    private String createInternalLink() {
+        Uri baseUri = Uri.parse(account.getUrl());
+        return baseUri + "/index.php/f/" +  note.getId();
     }
 
-    @Override
+    // TODO: Capabilities in notes app doesn't have following functions...
     public void createPublicShareLink() {
         if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
                 capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
@@ -243,22 +263,52 @@ public void createPublicShareLink() {
                     capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
 
         } else {
-            // create without password if not enforced by server or we don't know if enforced;
-            fileOperationsHelper.shareFileViaPublicShare(file, null);
+            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
+            // Is CreateShareViaLink operation compatible?
+
+            Intent service = new Intent(fileActivity, OperationsService.class);
+            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
+            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
+            if (!TextUtils.isEmpty(password)) {
+                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
+            }
+            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
     }
 
-    @Override
-    public void createSecureFileDrop() {
+    private void createSecureFileDrop() {
         fileOperationsHelper.shareFolderViaSecureFileDrop(file);
     }
 
+    /*
+    // TODO: Cant call getFileWithLink
+
+     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
+        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
+                                                                                       ShareType.PUBLIC_LINK,
+                                                                                       "");
+
+        if (shares.size() == SINGLE_LINK_SIZE) {
+            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
+        } else {
+            if (fileActivity instanceof FileDisplayActivity) {
+                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
+            } else {
+                showShareFile(file);
+            }
+        }
+
+        fileActivity.refreshList();
+    }
+     */
     private void showSendLinkTo(OCShare publicShare) {
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(publicShare.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
             } else {
-                FileDisplayActivity.showShareLinkDialog(fileActivity, file, publicShare.getShareLink());
+                // TODO: get link from public share and pass to the function
+                showShareLinkDialog();
             }
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
new file mode 100644
index 000000000..62eb8661a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
@@ -0,0 +1,37 @@
+package it.niedermann.owncloud.notes.share;
+
+
+import android.content.Context;
+import android.os.Handler;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.User;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
+import androidx.annotation.NonNull;
+
+public abstract class SyncOperation extends RemoteOperation {
+    private final User user;
+
+    public SyncOperation(@NonNull User user) {
+        this.user = user;
+    }
+
+    public RemoteOperationResult execute(Context context) {
+        return super.execute(user, context);
+    }
+
+    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
+        return run(client);
+    }
+
+    public Thread execute(OwnCloudClient client,
+                          OnRemoteOperationListener listener,
+                          Handler listenerHandler) {
+        return super.execute(client, listener, listenerHandler);
+    }
+
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
new file mode 100644
index 000000000..be773c7f7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
@@ -0,0 +1,40 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.server
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import java.net.URI
+
+/**
+ * This object provides all information necessary to interact
+ * with backend server.
+ */
+data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
+
+    constructor(source: Parcel) : this(
+        source.readSerializable() as URI,
+        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
+        writeSerializable(uri)
+        writeParcelable(version, 0)
+    }
+
+    companion object {
+        @JvmField
+        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
+            override fun createFromParcel(source: Parcel): Server = Server(source)
+            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
new file mode 100644
index 000000000..b68c4598d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
@@ -0,0 +1,56 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.user
+
+import android.accounts.Account
+import android.os.Parcelable
+import com.owncloud.android.lib.common.OwnCloudAccount
+import it.niedermann.owncloud.notes.shared.server.Server
+
+interface User : Parcelable, com.nextcloud.common.User {
+    override val accountName: String
+    val server: Server
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy platform Account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return Account instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    override fun toPlatformAccount(): Account
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy ownCloud account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return OwnCloudAccount instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    fun toOwnCloudAccount(): OwnCloudAccount
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(user: User?): Boolean
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(accountName: CharSequence?): Boolean
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
new file mode 100644
index 000000000..cb6c5e14f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
@@ -0,0 +1,50 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.shared.util
+
+import android.app.Activity
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.text.TextUtils
+import android.widget.Toast
+import com.owncloud.android.lib.common.utils.Log_OC
+import it.niedermann.owncloud.notes.R
+
+/**
+ * Helper implementation to copy a string into the system clipboard.
+ */
+object ClipboardUtil {
+    private val TAG = ClipboardUtil::class.java.name
+
+    @JvmStatic
+    @JvmOverloads
+    @Suppress("TooGenericExceptionCaught")
+    fun copyToClipboard(activity: Activity, text: String?, showToast: Boolean = true) {
+        if (!TextUtils.isEmpty(text)) {
+            try {
+                val clip = ClipData.newPlainText(
+                    activity.getString(
+                        R.string.clipboard_label,
+                        activity.getString(R.string.app_name)
+                    ),
+                    text
+                )
+                (activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(clip)
+                if (showToast) {
+                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show()
+                }
+            } catch (e: Exception) {
+                Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show()
+                Log_OC.e(TAG, "Exception caught while copying to clipboard", e)
+            }
+        } else {
+            Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show()
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9984a4779..06af4e559 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,6 +46,15 @@
     <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
     <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
     <string name="note_share_fragment_share_link">Share link</string>
+    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+
+    <string name="copy_link">Copy link</string>
+    <string name="clipboard_text_copied">Link copied</string>
+    <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>
+    <string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>
+    <string name="clipboard_label">Text copied from %1$s</string>
 
     <string name="listview_updated_today">Today</string>
     <string name="listview_updated_yesterday">Yesterday</string>

From 612e40053e3b16531c24b6f3630bd07bcaf90353 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 13:58:46 +0100
Subject: [PATCH 004/138] add viewholders

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |  46 +++--
 .../share/adapter/ShareeListAdapter.java      | 193 ++++++++++++++++++
 .../holder/InternalShareViewHolder.java       |  55 +++++
 .../adapter/holder/LinkShareViewHolder.java   |  93 +++++++++
 .../holder/NewLinkShareViewHolder.java        |  26 +++
 .../share/adapter/holder/ShareViewHolder.java | 117 +++++++++++
 .../notes/share/helper/SharingMenuHelper.java | 157 ++++++++++++++
 .../listener/ShareeListAdapterListener.java   |  23 +++
 .../CreateShareViaLinkOperation.java          |   2 +-
 .../share/{ => operations}/SyncOperation.java |   2 +-
 app/src/main/res/drawable/ic_email.xml        |  13 ++
 app/src/main/res/drawable/ic_external.xml     |  15 ++
 app/src/main/res/drawable/ic_plus.xml         |  13 ++
 .../main/res/layout/fragment_note_share.xml   |   2 +-
 .../main/res/layout/item_add_public_share.xml |  44 ++++
 .../res/layout/item_internal_share_link.xml   |  55 +++++
 ...ote_share_item.xml => item_note_share.xml} |   0
 .../main/res/layout/item_share_link_share.xml | 100 +++++++++
 app/src/main/res/layout/item_share_share.xml  |  74 +++++++
 app/src/main/res/values-night/colors.xml      |   3 +
 app/src/main/res/values/colors.xml            |   3 +-
 app/src/main/res/values/strings.xml           |  47 +++++
 22 files changed, 1062 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/NewLinkShareViewHolder.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
 rename app/src/main/java/it/niedermann/owncloud/notes/share/{ => operations}/CreateShareViaLinkOperation.java (98%)
 rename app/src/main/java/it/niedermann/owncloud/notes/share/{ => operations}/SyncOperation.java (95%)
 create mode 100644 app/src/main/res/drawable/ic_email.xml
 create mode 100644 app/src/main/res/drawable/ic_external.xml
 create mode 100644 app/src/main/res/drawable/ic_plus.xml
 create mode 100644 app/src/main/res/layout/item_add_public_share.xml
 create mode 100644 app/src/main/res/layout/item_internal_share_link.xml
 rename app/src/main/res/layout/{fragment_note_share_item.xml => item_note_share.xml} (100%)
 create mode 100644 app/src/main/res/layout/item_share_link_share.xml
 create mode 100644 app/src/main/res/layout/item_share_share.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 5f1004d38..2cfb2f88b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -29,6 +29,9 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,13 +42,13 @@
 import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
-        DisplayUtils.AvatarGenerationListener,
-        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener {
 
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
@@ -107,11 +110,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         binding = FragmentNoteShareBinding.inflate(inflater, container, false);
 
-        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
                 new ArrayList<>(),
                 this,
                 user,
-                note));
+                account));
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
 
@@ -223,7 +226,7 @@ private void setShareWithYou() {
         }
     }
 
-    private void copyInternalLink() {
+    public void copyInternalLink() {
         if (account == null) {
             BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
                     .setAnchorView(binding.sharesList)
@@ -438,7 +441,8 @@ public void refreshSharesFromDB() {
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.getShares().clear();
@@ -484,7 +488,8 @@ private void pickContactEmail() {
         if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
             onContactSelectionResultLauncher.launch(intent);
         } else {
-            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
+                    .show();
         }
     }
 
@@ -507,16 +512,19 @@ private void handleContactResult(@NonNull Uri contactUri) {
                         binding.searchView.requestFocus();
                     });
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                            .show();
                     Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
                 }
             } else {
-                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                        .show();
                 Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
             }
             cursor.close();
         } else {
-            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
         }
     }
@@ -534,8 +542,8 @@ private boolean containsNoNewPublicShare(List<OCShare> shares) {
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        FileExtensionsKt.logFileSize(file, TAG);
-        outState.putParcelable(ARG_NOTE, file);
+        outState.putSerializable(ARG_NOTE, note);
+        outState.putSerializable(ARG_ACCOUNT, account);
         outState.putParcelable(ARG_USER, user);
     }
 
@@ -576,7 +584,8 @@ public void unShare(OCShare share) {
         unshareWith(share);
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.remove(share);
@@ -612,7 +621,8 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 if (isGranted) {
                     pickContactEmail();
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
+                            .show();
                 }
             });
 
@@ -623,13 +633,15 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                         if (result.getResultCode() == Activity.RESULT_OK) {
                             Intent intent = result.getData();
                             if (intent == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
                             Uri contactUri = intent.getData();
                             if (contactUri == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
new file mode 100644
index 000000000..d9331c810
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -0,0 +1,193 @@
+package it.niedermann.owncloud.notes.share.adapter;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
+import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
+import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
+import it.niedermann.owncloud.notes.databinding.ItemShareShareBinding;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.adapter.holder.InternalShareViewHolder;
+import it.niedermann.owncloud.notes.share.adapter.holder.LinkShareViewHolder;
+import it.niedermann.owncloud.notes.share.adapter.holder.NewLinkShareViewHolder;
+import it.niedermann.owncloud.notes.share.adapter.holder.ShareViewHolder;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.shared.user.User;
+
+/**
+ * Adapter to show a user/group/email/remote in Sharing list in file details view.
+ */
+public class ShareeListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private Account account;
+    private final ShareeListAdapterListener listener;
+    private final Activity activity;
+    private List<OCShare> shares;
+    private final float avatarRadiusDimension;
+    private final User user;
+
+    public ShareeListAdapter(Activity activity,
+                             List<OCShare> shares,
+                             ShareeListAdapterListener listener,
+                             User user,
+                             Account account) {
+        this.activity = activity;
+        this.shares = shares;
+        this.listener = listener;
+        this.user = user;
+        this.account = account;
+        avatarRadiusDimension = activity.getResources().getDimension(R.dimen.default_icon_size);
+
+        sortShares();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return shares.get(position).getShareType().getValue();
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        switch (ShareType.fromValue(viewType)) {
+            case PUBLIC_LINK, EMAIL -> {
+                return new LinkShareViewHolder(
+                        ItemShareLinkShareBinding.inflate(LayoutInflater.from(activity),
+                                parent,
+                                false),
+                        activity);
+            }
+            case NEW_PUBLIC_LINK -> {
+                return new NewLinkShareViewHolder(
+                        ItemAddPublicShareBinding.inflate(LayoutInflater.from(activity),
+                                parent,
+                                false)
+                );
+            }
+            case INTERNAL -> {
+                return new InternalShareViewHolder(
+                        ItemInternalShareLinkBinding.inflate(LayoutInflater.from(activity), parent, false),
+                        activity);
+            }
+            default -> {
+                return new ShareViewHolder(ItemShareShareBinding.inflate(LayoutInflater.from(activity),
+                        parent,
+                        false),
+                        account,
+                        user,
+                        activity);
+            }
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (shares == null || shares.size() <= position) {
+            return;
+        }
+
+        final OCShare share = shares.get(position);
+
+        if (holder instanceof LinkShareViewHolder publicShareViewHolder) {
+            publicShareViewHolder.bind(share, listener);
+        } else if (holder instanceof InternalShareViewHolder internalShareViewHolder) {
+            internalShareViewHolder.bind(share, listener);
+        } else if (holder instanceof NewLinkShareViewHolder newLinkShareViewHolder) {
+            newLinkShareViewHolder.bind(listener);
+        } else {
+            ShareViewHolder userViewHolder = (ShareViewHolder) holder;
+            userViewHolder.bind(share, listener);
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return shares.get(position).getId();
+    }
+
+    @Override
+    public int getItemCount() {
+        return shares.size();
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    public void addShares(List<OCShare> sharesToAdd) {
+        shares.addAll(sharesToAdd);
+        sortShares();
+        notifyDataSetChanged();
+    }
+
+    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
+        if (callContext instanceof ImageView iv) {
+            iv.setImageDrawable(avatarDrawable);
+        }
+    }
+
+    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
+        if (callContext instanceof ImageView iv) {
+            // needs to be changed once federated users have avatars
+            return String.valueOf(iv.getTag()).equals(tag.split("@")[0]);
+        }
+        return false;
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    public void remove(OCShare share) {
+        shares.remove(share);
+        notifyDataSetChanged();
+    }
+
+    /**
+     * sort all by creation time, then email/link shares on top
+     */
+    protected final void sortShares() {
+        List<OCShare> links = new ArrayList<>();
+        List<OCShare> users = new ArrayList<>();
+
+        for (OCShare share : shares) {
+            if (ShareType.PUBLIC_LINK == share.getShareType() || ShareType.EMAIL == share.getShareType()) {
+                links.add(share);
+            } else if (share.getShareType() != ShareType.INTERNAL) {
+                users.add(share);
+            }
+        }
+
+        links.sort((o1, o2) -> Long.compare(o2.getSharedDate(), o1.getSharedDate()));
+        users.sort((o1, o2) -> Long.compare(o2.getSharedDate(), o1.getSharedDate()));
+
+        shares = links;
+        shares.addAll(users);
+
+        final OCShare ocShare = new OCShare();
+        ocShare.setShareType(ShareType.INTERNAL);
+        shares.add(ocShare);
+    }
+
+    public List<OCShare> getShares() {
+        return shares;
+    }
+
+    public void removeNewPublicShare() {
+        for (OCShare share : shares) {
+            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+                shares.remove(share);
+                break;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
new file mode 100644
index 000000000..4a7187bac
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
@@ -0,0 +1,55 @@
+package it.niedermann.owncloud.notes.share.adapter.holder;
+
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.view.View;
+
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+
+public class InternalShareViewHolder extends RecyclerView.ViewHolder {
+    private ItemInternalShareLinkBinding binding;
+    private Context context;
+
+    public InternalShareViewHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    public InternalShareViewHolder(ItemInternalShareLinkBinding binding, Context context) {
+        this(binding.getRoot());
+        this.binding = binding;
+        this.context = context;
+    }
+
+    public void bind(OCShare share, ShareeListAdapterListener listener) {
+        binding.copyInternalLinkIcon
+                .getBackground()
+                .setColorFilter(ResourcesCompat.getColor(context.getResources(),
+                                R.color.widget_foreground,
+                                null),
+                        PorterDuff.Mode.SRC_IN);
+        binding.copyInternalLinkIcon
+                .getDrawable()
+                .mutate()
+                .setColorFilter(ResourcesCompat.getColor(context.getResources(),
+                                R.color.fg_contrast,
+                                null),
+                        PorterDuff.Mode.SRC_IN);
+
+        if (share.isFolder()) {
+            binding.shareInternalLinkText.setText(context.getString(R.string.share_internal_link_to_folder_text));
+        } else {
+            binding.shareInternalLinkText.setText(context.getString(R.string.share_internal_link_to_file_text));
+        }
+
+        binding.copyInternalContainer.setOnClickListener(l -> listener.copyInternalLink());
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
new file mode 100644
index 000000000..5b03f8ceb
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
@@ -0,0 +1,93 @@
+package it.niedermann.owncloud.notes.share.adapter.holder;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.nextcloud.android.lib.resources.files.FileDownloadLimit;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
+import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+
+public class LinkShareViewHolder extends RecyclerView.ViewHolder {
+    private ItemShareLinkShareBinding binding;
+    private Context context;
+
+    public LinkShareViewHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    public LinkShareViewHolder(ItemShareLinkShareBinding binding, Context context) {
+        this(binding.getRoot());
+        this.binding = binding;
+        this.context = context;
+    }
+
+    public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
+        if (ShareType.EMAIL == publicShare.getShareType()) {
+            binding.name.setText(publicShare.getSharedWithDisplayName());
+            binding.icon.setImageDrawable(ResourcesCompat.getDrawable(context.getResources(),
+                    R.drawable.ic_email,
+                    null));
+            binding.copyLink.setVisibility(View.GONE);
+
+            binding.icon.getBackground().setColorFilter(context.getResources().getColor(R.color.nc_grey),
+                    PorterDuff.Mode.SRC_IN);
+            binding.icon.getDrawable().mutate().setColorFilter(context.getResources().getColor(R.color.icon_on_nc_grey),
+                    PorterDuff.Mode.SRC_IN);
+        } else {
+            if (!TextUtils.isEmpty(publicShare.getLabel())) {
+                String text = String.format(context.getString(R.string.share_link_with_label), publicShare.getLabel());
+                binding.name.setText(text);
+            } else {
+                if (SharingMenuHelper.isSecureFileDrop(publicShare)) {
+                    binding.name.setText(context.getResources().getString(R.string.share_permission_secure_file_drop));
+                } else {
+                    binding.name.setText(R.string.share_link);
+                }
+            }
+
+            // viewThemeUtils.platform.colorImageViewBackgroundAndIcon(binding.icon);
+        }
+
+        FileDownloadLimit downloadLimit = publicShare.getFileDownloadLimit();
+        if (downloadLimit != null && downloadLimit.getLimit() > 0) {
+            int remaining = downloadLimit.getLimit() - downloadLimit.getCount();
+            String text = context.getResources().getQuantityString(R.plurals.share_download_limit_description, remaining, remaining);
+
+            binding.subline.setText(text);
+            binding.subline.setVisibility(View.VISIBLE);
+        } else {
+            binding.subline.setVisibility(View.GONE);
+        }
+
+        String permissionName = SharingMenuHelper.getPermissionName(context, publicShare);
+        setPermissionName(publicShare, permissionName);
+
+        binding.overflowMenu.setOnClickListener(v -> listener.showSharingMenuActionSheet(publicShare));
+        if (!SharingMenuHelper.isSecureFileDrop(publicShare)) {
+            binding.shareByLinkContainer.setOnClickListener(v -> listener.showPermissionsDialog(publicShare));
+        }
+
+        binding.copyLink.setOnClickListener(v -> listener.copyLink(publicShare));
+    }
+
+    private void setPermissionName(OCShare publicShare, String permissionName) {
+        if (!TextUtils.isEmpty(permissionName) && !SharingMenuHelper.isSecureFileDrop(publicShare)) {
+            binding.permissionName.setText(permissionName);
+            binding.permissionName.setVisibility(View.VISIBLE);
+            // viewThemeUtils.androidx.colorPrimaryTextViewElement(binding.permissionName);
+        } else {
+            binding.permissionName.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/NewLinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/NewLinkShareViewHolder.java
new file mode 100644
index 000000000..f2e795a0b
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/NewLinkShareViewHolder.java
@@ -0,0 +1,26 @@
+package it.niedermann.owncloud.notes.share.adapter.holder;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+
+public class NewLinkShareViewHolder extends RecyclerView.ViewHolder {
+    private ItemAddPublicShareBinding binding;
+
+    public NewLinkShareViewHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    public NewLinkShareViewHolder(ItemAddPublicShareBinding binding) {
+        this(binding.getRoot());
+        this.binding = binding;
+    }
+
+    public void bind(ShareeListAdapterListener listener) {
+        binding.addNewPublicShareLink.setOnClickListener(v -> listener.createPublicShareLink());
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
new file mode 100644
index 000000000..0d6eec7df
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -0,0 +1,117 @@
+package it.niedermann.owncloud.notes.share.adapter.holder;
+
+
+import android.content.Context;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.databinding.ItemShareShareBinding;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public class ShareViewHolder extends RecyclerView.ViewHolder {
+    private ItemShareShareBinding binding;
+    private User user;
+    private Account account;
+    private Context context;
+
+    public ShareViewHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    public ShareViewHolder(ItemShareShareBinding binding,
+                           Account account,
+                           User user,
+                           Context context) {
+        this(binding.getRoot());
+        this.binding = binding;
+        this.user = user;
+        this.account = account;
+        this.context = context;
+    }
+
+    public void bind(OCShare share,
+                     ShareeListAdapterListener listener) {
+        String userId = String.valueOf(account.getId());
+        String name = share.getSharedWithDisplayName();
+        binding.icon.setTag(null);
+
+        switch (share.getShareType()) {
+            case GROUP:
+                name = context.getString(R.string.share_group_clarification, name);
+                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                break;
+            case ROOM:
+                name = context.getString(R.string.share_room_clarification, name);
+                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                break;
+            case CIRCLE:
+                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                break;
+            case FEDERATED:
+                name = context.getString(R.string.share_remote_clarification, name);
+                setImage(binding.icon, share.getSharedWithDisplayName(), R.drawable.ic_account_circle_grey_24dp);
+                break;
+            case USER:
+                binding.icon.setTag(share.getShareWith());
+
+                Glide.with(context)
+                        .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                        .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                        .error(R.drawable.ic_account_circle_grey_24dp)
+                        .apply(RequestOptions.circleCropTransform())
+                        .into(binding.icon);
+
+                binding.icon.setOnClickListener(v -> listener.showProfileBottomSheet(user, share.getShareWith()));
+            default:
+                setImage(binding.icon, name, R.drawable.ic_account_circle_grey_24dp);
+                break;
+        }
+
+        binding.name.setText(name);
+
+        if (share.getShareWith().equalsIgnoreCase(userId) || share.getUserId().equalsIgnoreCase(userId)) {
+            binding.overflowMenu.setVisibility(View.VISIBLE);
+
+            String permissionName = SharingMenuHelper.getPermissionName(context, share);
+            setPermissionName(permissionName);
+
+            // bind listener to edit privileges
+            binding.overflowMenu.setOnClickListener(v -> listener.showSharingMenuActionSheet(share));
+            binding.shareNameLayout.setOnClickListener(v -> listener.showPermissionsDialog(share));
+        } else {
+            binding.overflowMenu.setVisibility(View.GONE);
+        }
+    }
+
+    private void setPermissionName(String permissionName) {
+        if (!TextUtils.isEmpty(permissionName)) {
+            binding.permissionName.setText(permissionName);
+            binding.permissionName.setVisibility(View.VISIBLE);
+        } else {
+            binding.permissionName.setVisibility(View.GONE);
+        }
+    }
+
+    private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
+        try {
+            // avatar.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadiusDimension));
+        } catch (StringIndexOutOfBoundsException e) {
+            avatar.setImageResource(fallback);
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
new file mode 100644
index 000000000..5246da0f7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
@@ -0,0 +1,157 @@
+package it.niedermann.owncloud.notes.share.helper;
+
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.view.MenuItem;
+
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
+import static com.owncloud.android.lib.resources.shares.OCShare.NO_PERMISSION;
+import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG;
+
+import it.niedermann.owncloud.notes.R;
+
+/**
+ * Helper calls for visibility logic of the sharing menu.
+ */
+public final class SharingMenuHelper {
+
+    private SharingMenuHelper() {
+        // utility class -> private constructor
+    }
+
+    /**
+     * Sets checked/visibility state on the given {@link MenuItem} based on the given criteria.
+     *
+     * @param menuItem the {@link MenuItem} to be setup
+     */
+    public static void setupHideFileDownload(MenuItem menuItem,
+                                             boolean hideFileDownload,
+                                             boolean isFileDrop) {
+        if (isFileDrop) {
+            menuItem.setVisible(false);
+        } else {
+            menuItem.setVisible(true);
+            menuItem.setChecked(hideFileDownload);
+        }
+    }
+
+    /**
+     * sets up the password {@link MenuItem}'s title based on the fact if a password is present.
+     *
+     * @param password            the password {@link MenuItem}
+     * @param isPasswordProtected flag is a password is present
+     */
+    public static void setupPasswordMenuItem(MenuItem password, boolean isPasswordProtected) {
+        if (isPasswordProtected) {
+            password.setTitle(R.string.share_password_title);
+        } else {
+            password.setTitle(R.string.share_no_password_title);
+        }
+    }
+
+    /**
+     * sets up the expiration date {@link MenuItem}'s title based on the fact if an expiration date is present.
+     *
+     * @param expirationDate      the expiration date {@link MenuItem}
+     * @param expirationDateValue the expiration date
+     * @param res                 Resources to load the corresponding strings.
+     */
+    public static void setupExpirationDateMenuItem(MenuItem expirationDate, long expirationDateValue, Resources res) {
+        if (expirationDateValue > 0) {
+            expirationDate.setTitle(res.getString(
+                    R.string.share_expiration_date_label,
+                    SimpleDateFormat.getDateInstance().format(new Date(expirationDateValue))
+            ));
+        } else {
+            expirationDate.setTitle(R.string.share_no_expiration_date_label);
+        }
+    }
+
+    public static boolean isUploadAndEditingAllowed(OCShare share) {
+        if (share.getPermissions() == NO_PERMISSION) {
+            return false;
+        }
+
+        return (share.getPermissions() & (share.isFolder() ? MAXIMUM_PERMISSIONS_FOR_FOLDER :
+                MAXIMUM_PERMISSIONS_FOR_FILE)) == (share.isFolder() ? MAXIMUM_PERMISSIONS_FOR_FOLDER :
+                MAXIMUM_PERMISSIONS_FOR_FILE);
+    }
+
+    public static boolean isReadOnly(OCShare share) {
+        if (share.getPermissions() == NO_PERMISSION) {
+            return false;
+        }
+
+        return (share.getPermissions() & ~SHARE_PERMISSION_FLAG) == READ_PERMISSION_FLAG;
+    }
+
+    public static boolean isFileDrop(OCShare share) {
+        if (share.getPermissions() == NO_PERMISSION) {
+            return false;
+        }
+
+        return (share.getPermissions() & ~SHARE_PERMISSION_FLAG) == CREATE_PERMISSION_FLAG;
+    }
+
+    public static boolean isSecureFileDrop(OCShare share) {
+        if (share.getPermissions() == NO_PERMISSION) {
+            return false;
+        }
+
+        return (share.getPermissions() & ~SHARE_PERMISSION_FLAG) == CREATE_PERMISSION_FLAG + READ_PERMISSION_FLAG;
+    }
+
+    public static String getPermissionName(Context context, OCShare share) {
+        if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
+            return context.getResources().getString(R.string.share_permission_can_edit);
+        } else if (SharingMenuHelper.isReadOnly(share)) {
+            return context.getResources().getString(R.string.share_permission_view_only);
+        } else if (SharingMenuHelper.isSecureFileDrop(share)) {
+            return context.getResources().getString(R.string.share_permission_secure_file_drop);
+        } else if (SharingMenuHelper.isFileDrop(share)) {
+            return context.getResources().getString(R.string.share_permission_file_drop);
+        }
+        return null;
+    }
+
+    /**
+     * method to get the current checked index from the list of permissions
+     *
+     */
+    public static int getPermissionCheckedItem(Context context, OCShare share, String[] permissionArray) {
+        if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
+            if (share.isFolder()) {
+                return getPermissionIndexFromArray(context, permissionArray, R.string.link_share_allow_upload_and_editing);
+            } else {
+                return getPermissionIndexFromArray(context, permissionArray, R.string.link_share_editing);
+            }
+        } else if (SharingMenuHelper.isReadOnly(share)) {
+            return getPermissionIndexFromArray(context, permissionArray, R.string.link_share_view_only);
+        } else if (SharingMenuHelper.isFileDrop(share)) {
+            return getPermissionIndexFromArray(context, permissionArray, R.string.link_share_file_drop);
+        }
+        return 0;//default first item selected
+    }
+
+    private static int getPermissionIndexFromArray(Context context, String[] permissionArray, int permissionName) {
+        for (int i = 0; i < permissionArray.length; i++) {
+            if (permissionArray[i].equalsIgnoreCase(context.getResources().getString(permissionName))) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+    public static boolean canReshare(OCShare share) {
+        return (share.getPermissions() & SHARE_PERMISSION_FLAG) > 0;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
new file mode 100644
index 000000000..72d9737e4
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
@@ -0,0 +1,23 @@
+package it.niedermann.owncloud.notes.share.listener;
+
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public interface ShareeListAdapterListener {
+    void copyLink(OCShare share);
+
+    void showSharingMenuActionSheet(OCShare share);
+
+    void copyInternalLink();
+
+    void createPublicShareLink();
+
+    void createSecureFileDrop();
+
+    void requestPasswordForShare(OCShare share, boolean askForPassword);
+
+    void showPermissionsDialog(OCShare share);
+
+    void showProfileBottomSheet(User user, String shareWith);
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
similarity index 98%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
index 509fce819..2a49dcb02 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.share;
+package it.niedermann.owncloud.notes.share.operations;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
similarity index 95%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
index 62eb8661a..3e4b601be 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.share;
+package it.niedermann.owncloud.notes.share.operations;
 
 
 import android.content.Context;
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
new file mode 100644
index 000000000..c6e736593
--- /dev/null
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -0,0 +1,13 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#757575" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_external.xml b/app/src/main/res/drawable/ic_external.xml
new file mode 100644
index 000000000..599123616
--- /dev/null
+++ b/app/src/main/res/drawable/ic_external.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M200,840q-33,0 -56.5,-23.5T120,760v-560q0,-33 23.5,-56.5T200,120h280v80L200,200v560h560v-280h80v280q0,33 -23.5,56.5T760,840L200,840ZM388,628 L332,572 704,200L560,200v-80h280v280h-80v-144L388,628Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
new file mode 100644
index 000000000..4f0bc1a41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_plus.xml
@@ -0,0 +1,13 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#757575" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_note_share.xml b/app/src/main/res/layout/fragment_note_share.xml
index 4cb469afc..4ce2f8cdb 100644
--- a/app/src/main/res/layout/fragment_note_share.xml
+++ b/app/src/main/res/layout/fragment_note_share.xml
@@ -119,6 +119,6 @@
         android:layout_height="match_parent"
         android:divider="@drawable/divider"
         android:dividerHeight="1dp"
-        tools:listitem="@layout/fragment_note_share_item" />
+        tools:listitem="@layout/item_note_share" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_add_public_share.xml b/app/src/main/res/layout/item_add_public_share.xml
new file mode 100644
index 000000000..7a58d7311
--- /dev/null
+++ b/app/src/main/res/layout/item_add_public_share.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/add_public_share"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/sharee_list_item_size"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:background="@drawable/round_bgnd"
+        android:contentDescription="@string/note_share_fragment_share_icon_content_description"
+        android:padding="@dimen/spacer_1x"
+        android:src="@drawable/shared_via_link" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:text="@string/share_via_link_section_title"
+        android:textSize="@dimen/note_font_size_small" />
+
+    <ImageView
+        android:id="@+id/add_new_public_share_link"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/add_new_public_share"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:src="@drawable/ic_plus" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_internal_share_link.xml b/app/src/main/res/layout/item_internal_share_link.xml
new file mode 100644
index 000000000..f83e05a46
--- /dev/null
+++ b/app/src/main/res/layout/item_internal_share_link.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout android:id="@+id/copy_internal_container"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/spacer_1x"
+    android:paddingEnd="@dimen/spacer_2x"
+    android:paddingStart="@dimen/zero"
+    android:paddingTop="@dimen/spacer_1x"
+    android:layout_weight="1"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:background="@drawable/round_bgnd"
+        android:contentDescription="@string/note_share_fragment_external_icon_content_description"
+        android:id="@+id/copy_internal_link_icon"
+        android:layout_gravity="top"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_width="@dimen/default_icon_size"
+        android:padding="@dimen/spacer_1x"
+        android:src="@drawable/ic_external" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacer_1x"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/shareInternalLink"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/share_internal_link"
+            android:textColor="@color/widget_foreground"
+            android:textSize="@dimen/note_font_size_small" />
+
+        <TextView
+            android:id="@+id/shareInternalLinkText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/note_font_size_small"
+            tools:text="@string/share_internal_link_to_folder_text" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_note_share_item.xml b/app/src/main/res/layout/item_note_share.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_note_share_item.xml
rename to app/src/main/res/layout/item_note_share.xml
diff --git a/app/src/main/res/layout/item_share_link_share.xml b/app/src/main/res/layout/item_share_link_share.xml
new file mode 100644
index 000000000..c3723174d
--- /dev/null
+++ b/app/src/main/res/layout/item_share_link_share.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/share_by_link_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/sharee_list_item_size"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:background="@drawable/round_bgnd"
+        android:contentDescription="@string/note_share_fragment_share_icon_content_description"
+        android:padding="@dimen/spacer_1x"
+        android:src="@drawable/shared_via_link" />
+
+    <LinearLayout
+        android:id="@+id/share_name_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="@string/share_via_link_section_title"
+            android:textColor="@color/widget_foreground"
+            android:textSize="@dimen/note_font_size_small" />
+
+        <TextView
+            android:id="@+id/subline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:singleLine="true"
+            tools:text="5 downloads remaining"
+            tools:visibility="visible"
+            android:textColor="@color/widget_foreground"
+            android:textSize="@dimen/note_font_size_minimum" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/permission_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            tools:text="View only"
+            app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:drawableTint="@color/primary"
+            app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            android:textColor="@color/primary"
+            android:textSize="@dimen/note_font_size_minimum" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/copy_link"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/copy_link"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1hx"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1hx"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_content_copy" />
+
+    <ImageView
+        android:id="@+id/overflow_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:src="@drawable/ic_dots_vertical" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_share_share.xml b/app/src/main/res/layout/item_share_share.xml
new file mode 100644
index 000000000..cb18c173b
--- /dev/null
+++ b/app/src/main/res/layout/item_share_share.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2015 María Asensio Valverde <masensio@solidgear.es
+  ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/sharee_list_item_size"
+    android:orientation="horizontal"
+    android:weightSum="1"
+    tools:ignore="UseCompoundDrawables">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_marginLeft="@dimen/spacer_2x"
+        android:layout_marginTop="@dimen/spacer_1x"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:layout_marginRight="@dimen/spacer_2x"
+        android:layout_marginBottom="@dimen/spacer_1x"
+        android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+        android:src="@drawable/ic_account_circle_grey_24dp" />
+
+    <LinearLayout
+        android:id="@+id/share_name_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="@string/username"
+            android:textColor="@color/widget_foreground"
+            android:textSize="@dimen/note_font_size_small" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/permission_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="@color/primary"
+            android:textSize="@dimen/note_font_size_minimum"
+            app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:drawableTint="@color/primary"
+            tools:text="View only" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/overflow_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:paddingStart="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/spacer_2x"
+        android:src="@drawable/ic_dots_vertical" />
+</LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 4200f876f..b3ae42a7a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -32,4 +32,7 @@
 
     <color name="widget_background">#dd000000</color>
     <color name="widget_foreground">#d8d8d8</color>
+
+    <color name="nc_grey">#222222</color>
+    <color name="icon_on_nc_grey">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ce764c365..d504c3391 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -30,7 +30,8 @@
     <color name="fg_default_high">#cccccc</color>
     <color name="fg_secondary">#999999</color>
     <color name="fg_contrast">#ffffff</color>
-
+    <color name="nc_grey">#ededed</color>
+    <color name="icon_on_nc_grey">#000000</color>
     <color name="grey600">#757575</color>
     <color name="icon_color_default">@color/grey600</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06af4e559..95bda96f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,8 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
     <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
     <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
     <string name="note_share_fragment_icon_content_description">note share icon</string>
@@ -49,6 +51,51 @@
     <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
     <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
     <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="contact_no_permission">Contact permission is required.</string>
+    <string name="email_pick_failed">Failed to pick email address.</string>
+    <string name="failed_update_ui">Failed to update UI</string>
+    <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
+
+    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
+    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
+    <string name="share_internal_link">Share internal link</string>
+
+    <string name="share_dialog_title">Sharing</string>
+    <string name="share_file">Share %1$s</string>
+    <string name="share_expiration_date_label">Expires %1$s</string>
+    <string name="share_expiration_date_format">%1$s</string>
+    <string name="share_no_expiration_date_label">Set expiration date</string>
+    <string name="share_via_link_section_title">Share link</string>
+    <string name="share_via_link_send_link_label">Send link</string>
+    <string name="share_password_title">Password-protected</string>
+    <string name="share_no_password_title">Set password</string>
+    <string name="share_with_title">Share with…</string>
+    <string name="share_via_link_unset_password">Unset</string>
+    <string name="add_another_public_share_link">Add another link</string>
+    <string name="add_new_public_share">Add new public share link</string>
+    <string name="public_share_name">New name</string>
+    <string name="share_link_with_label">Share link (%1$s)</string>
+    <string name="share_link">Share link</string>
+    <string name="allow_resharing">Allow resharing</string>
+    <string name="link_share_view_only">View only</string>
+    <string name="link_share_editing">Editing</string>
+    <string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
+    <string name="link_share_file_drop">File drop (upload only)</string>
+    <string name="could_not_retrieve_shares">Could not retrieve shares</string>
+    <string name="share_permission_view_only">View only</string>
+    <string name="share_permission_can_edit">Can edit</string>
+    <string name="share_permission_file_drop">File drop</string>
+    <string name="share_permission_secure_file_drop">Secure file drop</string>
+    <string name="share_permissions">Share Permissions</string>
+    <plurals name="share_download_limit_description">
+        <item quantity="one">%1$d download remaining</item>
+        <item quantity="other">%1$d downloads remaining</item>
+    </plurals>
+    <string name="username">Username</string>
+    <string name="share_group_clarification">%1$s (group)</string>
+    <string name="share_remote_clarification">%1$s (remote)</string>
+    <string name="share_room_clarification">%1$s (conversation)</string>
+    <string name="share_known_remote_on_clarification">on %1$s</string>
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>

From 0dec990038b80d807c1dc3bd83e37bdc05d39f0d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 14:51:29 +0100
Subject: [PATCH 005/138] add UsersAndGroupsSearchConfig

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareFragment.java          | 5 +++--
 .../notes/share/model/UsersAndGroupsSearchConfig.kt      | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/UsersAndGroupsSearchConfig.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 2cfb2f88b..185430583 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -44,6 +44,7 @@
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
@@ -144,13 +145,13 @@ public void onAttach(@NonNull Context context) {
     @Override
     public void onStart() {
         super.onStart();
-        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
     }
 
     @Override
     public void onStop() {
         super.onStop();
-        searchConfig.reset();
+        UsersAndGroupsSearchConfig.INSTANCE.reset();
     }
 
     private void setupView() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UsersAndGroupsSearchConfig.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UsersAndGroupsSearchConfig.kt
new file mode 100644
index 000000000..10adce634
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UsersAndGroupsSearchConfig.kt
@@ -0,0 +1,9 @@
+package it.niedermann.owncloud.notes.share.model
+
+object UsersAndGroupsSearchConfig {
+    var searchOnlyUsers: Boolean = false
+
+    fun reset() {
+        searchOnlyUsers = false
+    }
+}

From 547b732df3e0bbd96b9326cfad937f4163eff433 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 15:02:00 +0100
Subject: [PATCH 006/138] add ShareLinkToDialog

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |  56 ++++++-
 .../notes/share/dialog/ShareLinkDialog.kt     | 141 ++++++++++++++++++
 .../util/{ => clipboard}/ClipboardUtil.kt     |   2 +-
 .../util/clipboard/CopyToClipboardActivity.kt |  16 ++
 app/src/main/res/layout/activity_row.xml      |  37 +++++
 app/src/main/res/values/dimens.xml            |   4 +
 app/src/main/res/values/strings.xml           |   2 +
 7 files changed, 249 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ShareLinkDialog.kt
 rename app/src/main/java/it/niedermann/owncloud/notes/shared/util/{ => clipboard}/ClipboardUtil.kt (96%)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/CopyToClipboardActivity.kt
 create mode 100644 app/src/main/res/layout/activity_row.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 185430583..d566845e5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.SearchManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -15,6 +16,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -43,10 +45,11 @@
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
+import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
 public class NoteShareFragment extends Fragment implements ShareeListAdapterListener {
@@ -55,6 +58,7 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
     private static final String ARG_NOTE = "NOTE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
     private static final String ARG_USER = "USER";
+    public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
     private FragmentNoteShareBinding binding;
     private Note note;
@@ -157,14 +161,17 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
 
-        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
 
-        FileDetailSharingFragmentHelper.setupSearchView(
-                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
-                binding.searchView,
-                fileActivity.getComponentName());
-        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
+        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
+        binding.pickContactEmailBtn.setVisibility(View.GONE);
+        disableSearchView(binding.searchView);
+
+        /*
         if (file.canReshare()) {
             binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
         } else {
@@ -173,6 +180,39 @@ private void setupView() {
             binding.pickContactEmailBtn.setVisibility(View.GONE);
             disableSearchView(binding.searchView);
         }
+         */
+
+    }
+
+    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
+                                       ComponentName componentName) {
+        if (searchManager == null) {
+            searchView.setVisibility(View.GONE);
+            return;
+        }
+
+        // assumes parent activity is the searchable activity
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
+
+        // do not iconify the widget; expand it by default
+        searchView.setIconifiedByDefault(false);
+
+        // avoid fullscreen with softkeyboard
+        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                // return true to prevent the query from being processed;
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                // leave it for the parent listener in the hierarchy / default behaviour
+                return false;
+            }
+        });
     }
 
     private void disableSearchView(View view) {
@@ -249,7 +289,7 @@ private void showShareLinkDialog() {
 
         String[] packagesToExclude = new String[] { requireContext().getPackageName() };
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
+        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
     // TODO: Check account.getUrl returning base url?
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ShareLinkDialog.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ShareLinkDialog.kt
new file mode 100644
index 000000000..08faf11e9
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ShareLinkDialog.kt
@@ -0,0 +1,141 @@
+package it.niedermann.owncloud.notes.share.dialog
+
+
+import android.app.Dialog
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.owncloud.android.lib.common.utils.Log_OC
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.shared.util.clipboard.CopyToClipboardActivity
+import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
+import java.util.Collections
+
+/**
+ * Dialog showing a list activities able to resolve a given Intent,
+ * filtering out the activities matching give package names.
+ */
+class ShareLinkToDialog : DialogFragment() {
+    private var mAdapter: ActivityAdapter? = null
+    private var mIntent: Intent? = null
+
+    init {
+        Log_OC.d(TAG, "constructor")
+    }
+
+    @Suppress("SpreadOperator")
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        mIntent = arguments.getParcelableArgument(ARG_INTENT, Intent::class.java) ?: throw NullPointerException()
+        val packagesToExclude = arguments?.getStringArray(ARG_PACKAGES_TO_EXCLUDE)
+        val packagesToExcludeList = listOf(*packagesToExclude ?: arrayOfNulls(0))
+        val pm = activity?.packageManager ?: throw NullPointerException()
+
+        val activities = pm.queryIntentActivities(mIntent!!, PackageManager.MATCH_DEFAULT_ONLY)
+        val it = activities.iterator()
+        var resolveInfo: ResolveInfo
+        while (it.hasNext()) {
+            resolveInfo = it.next()
+            if (packagesToExcludeList.contains(resolveInfo.activityInfo.packageName.lowercase())) {
+                it.remove()
+            }
+        }
+
+        val sendAction = mIntent?.getBooleanExtra(Intent.ACTION_SEND, false)
+
+        if (sendAction == false) {
+            // add activity for copy to clipboard
+            val copyToClipboardIntent = Intent(requireActivity(), CopyToClipboardActivity::class.java)
+            val copyToClipboard = pm.queryIntentActivities(copyToClipboardIntent, 0)
+            if (copyToClipboard.isNotEmpty()) {
+                activities.add(copyToClipboard[0])
+            }
+        }
+
+        Collections.sort(activities, ResolveInfo.DisplayNameComparator(pm))
+        mAdapter = ActivityAdapter(requireActivity(), pm, activities)
+
+        return createSelector(sendAction ?: false)
+    }
+
+    private fun createSelector(sendAction: Boolean): AlertDialog {
+        val titleId = if (sendAction) {
+            R.string.activity_chooser_send_file_title
+        } else {
+            R.string.activity_chooser_title
+        }
+
+        return MaterialAlertDialogBuilder(requireActivity())
+            .setTitle(titleId)
+            .setAdapter(mAdapter) { _, which ->
+                // Add the information of the chosen activity to the intent to send
+                val chosen = mAdapter?.getItem(which)
+                val actInfo = chosen?.activityInfo ?: return@setAdapter
+                val name = ComponentName(
+                    actInfo.applicationInfo.packageName,
+                    actInfo.name
+                )
+                mIntent?.setComponent(name)
+                activity?.startActivity(mIntent)
+            }
+            .create()
+    }
+
+    internal inner class ActivityAdapter(
+        context: Context,
+        private val mPackageManager: PackageManager,
+        apps: List<ResolveInfo>
+    ) : ArrayAdapter<ResolveInfo?>(context, R.layout.activity_row, apps) {
+        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+            val view = convertView ?: newView(parent)
+            bindView(position, view)
+            return view
+        }
+
+        private fun newView(parent: ViewGroup): View {
+            return (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater)
+                .inflate(R.layout.activity_row, parent, false)
+        }
+
+        private fun bindView(position: Int, row: View) {
+            row.findViewById<TextView>(R.id.title).run {
+                text = getItem(position)?.loadLabel(mPackageManager)
+            }
+
+            row.findViewById<ImageView>(R.id.icon).run {
+                setImageDrawable(getItem(position)?.loadIcon(mPackageManager))
+            }
+        }
+    }
+
+    companion object {
+        private val TAG: String = ShareLinkToDialog::class.java.simpleName
+        private val ARG_INTENT = ShareLinkToDialog::class.java.simpleName +
+                ".ARG_INTENT"
+        private val ARG_PACKAGES_TO_EXCLUDE = ShareLinkToDialog::class.java.simpleName +
+                ".ARG_PACKAGES_TO_EXCLUDE"
+
+        @JvmStatic
+        fun newInstance(intent: Intent?, vararg packagesToExclude: String?): ShareLinkToDialog {
+            val bundle = Bundle().apply {
+                putParcelable(ARG_INTENT, intent)
+                putStringArray(ARG_PACKAGES_TO_EXCLUDE, packagesToExclude)
+            }
+
+            return ShareLinkToDialog().apply {
+                arguments = bundle
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/ClipboardUtil.kt
similarity index 96%
rename from app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
rename to app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/ClipboardUtil.kt
index cb6c5e14f..9e07f56e0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/ClipboardUtil.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 
-package it.niedermann.owncloud.notes.shared.util
+package it.niedermann.owncloud.notes.shared.util.clipboard
 
 import android.app.Activity
 import android.content.ClipData
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/CopyToClipboardActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/CopyToClipboardActivity.kt
new file mode 100644
index 000000000..4c5ed9587
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/clipboard/CopyToClipboardActivity.kt
@@ -0,0 +1,16 @@
+package it.niedermann.owncloud.notes.shared.util.clipboard
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+
+/**
+ * Activity copying the text of the received Intent into the system clipboard.
+ */
+class CopyToClipboardActivity : Activity() {
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        ClipboardUtil.copyToClipboard(this, intent.getCharSequenceExtra(Intent.EXTRA_TEXT).toString())
+        finish()
+    }
+}
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
new file mode 100644
index 000000000..e30c1366e
--- /dev/null
+++ b/app/src/main/res/layout/activity_row.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_item"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/activity_row_layout_height"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:minWidth="@dimen/activity_row_layout_min_width_independent"
+    android:orientation="horizontal"
+    android:paddingEnd="@dimen/spacer_2x"
+    android:paddingLeft="@dimen/spacer_2x"
+    android:paddingRight="@dimen/spacer_2x"
+    android:paddingStart="@dimen/spacer_2x">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:contentDescription="@string/activity_icon" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceLargePopupMenu" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 55c8ef8d7..c2b9ce739 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -22,6 +22,10 @@
 
     <dimen name="avatar_size">36dp</dimen>
 
+    <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
+    <dimen name="activity_row_layout_height">48dp</dimen>
+
+
     <dimen name="spacer_activity_sides">0dp</dimen>
 
     <dimen name="default_icon_size">40dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95bda96f1..c4a2cdb0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,9 @@
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>
     <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
+    <string name="activity_chooser_title">Send link to…</string>
 
+    <string name="activity_chooser_send_file_title">Send</string>
     <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
     <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
     <string name="share_internal_link">Share internal link</string>

From 34f4a5aff1e049da21ecd84c8999f4a1c59e6f54 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 15:29:25 +0100
Subject: [PATCH 007/138] add FileDetailSharingMenuBottomSheetDialog

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |  21 +-
 ...ileDetailSharingMenuBottomSheetDialog.java | 111 +++++++++++
 ...eDetailsSharingMenuBottomSheetActions.java |  32 +++
 app/src/main/res/drawable/ic_delete.xml       |  16 ++
 app/src/main/res/drawable/ic_edit.xml         |  19 ++
 app/src/main/res/drawable/ic_link.xml         |  16 ++
 ...ils_sharing_menu_bottom_sheet_fragment.xml | 184 ++++++++++++++++++
 app/src/main/res/values-night/colors.xml      |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/dimens.xml            |   5 +-
 app/src/main/res/values/strings.xml           |   4 +-
 11 files changed, 393 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java
 create mode 100644 app/src/main/res/drawable/ic_delete.xml
 create mode 100644 app/src/main/res/drawable/ic_edit.xml
 create mode 100644 app/src/main/res/drawable/ic_link.xml
 create mode 100644 app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index d566845e5..35a2a0642 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -45,14 +45,16 @@
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener {
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions {
 
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
@@ -321,7 +323,7 @@ public void createPublicShareLink() {
         }
     }
 
-    private void createSecureFileDrop() {
+    public void createSecureFileDrop() {
         fileOperationsHelper.shareFolderViaSecureFileDrop(file);
     }
 
@@ -367,24 +369,13 @@ public void copyLink(OCShare share) {
         }
     }
 
-    /**
-     * show share action bottom sheet
-     *
-     * @param share
-     */
     @Override
-    @VisibleForTesting
     public void showSharingMenuActionSheet(OCShare share) {
-        if (fileActivity != null && !fileActivity.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        if (getActivity() != null && !getActivity().isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
         }
     }
 
-    /**
-     * show quick sharing permission dialog
-     *
-     * @param share
-     */
     @Override
     public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
new file mode 100644
index 000000000..9dacd8118
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
@@ -0,0 +1,111 @@
+package it.niedermann.owncloud.notes.share.dialog;
+
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+import it.niedermann.owncloud.notes.databinding.FileDetailsSharingMenuBottomSheetFragmentBinding;
+import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+
+/**
+ * File Details Sharing option menus {@link android.app.Dialog} styled as a bottom sheet for main actions.
+ */
+public class FileDetailSharingMenuBottomSheetDialog extends BottomSheetDialog {
+    private FileDetailsSharingMenuBottomSheetFragmentBinding binding;
+    private final FileDetailsSharingMenuBottomSheetActions actions;
+    private final OCShare ocShare;
+    public FileDetailSharingMenuBottomSheetDialog(Activity activity,
+                                                  FileDetailsSharingMenuBottomSheetActions actions,
+                                                  OCShare ocShare) {
+        super(activity);
+        this.actions = actions;
+        this.ocShare = ocShare;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = FileDetailsSharingMenuBottomSheetFragmentBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        if (getWindow() != null) {
+            getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        }
+
+        /*
+         viewThemeUtils.platform.themeDialog(binding.getRoot());
+
+        viewThemeUtils.platform.colorImageView(binding.menuIconAddAnotherLink);
+        viewThemeUtils.platform.colorImageView(binding.menuIconAdvancedPermissions);
+        viewThemeUtils.platform.colorImageView(binding.menuIconSendLink);
+        viewThemeUtils.platform.colorImageView(binding.menuIconUnshare);
+        viewThemeUtils.platform.colorImageView(binding.menuIconSendNewEmail);
+         */
+
+
+        updateUI();
+
+        setupClickListener();
+
+        setOnShowListener(d ->
+                BottomSheetBehavior.from((View) binding.getRoot().getParent())
+                        .setPeekHeight(binding.getRoot().getMeasuredHeight())
+        );
+    }
+
+    private void updateUI() {
+        if (ocShare.getShareType() == ShareType.PUBLIC_LINK) {
+            binding.menuShareAddAnotherLink.setVisibility(View.VISIBLE);
+            binding.menuShareSendLink.setVisibility(View.VISIBLE);
+        } else {
+            binding.menuShareAddAnotherLink.setVisibility(View.GONE);
+            binding.menuShareSendLink.setVisibility(View.GONE);
+        }
+
+        if (SharingMenuHelper.isSecureFileDrop(ocShare)) {
+            binding.menuShareAdvancedPermissions.setVisibility(View.GONE);
+            binding.menuShareAddAnotherLink.setVisibility(View.GONE);
+        }
+    }
+
+    private void setupClickListener() {
+        binding.menuShareAdvancedPermissions.setOnClickListener(v -> {
+            actions.advancedPermissions(ocShare);
+            dismiss();
+        });
+
+        binding.menuShareSendNewEmail.setOnClickListener(v -> {
+            actions.sendNewEmail(ocShare);
+            dismiss();
+        });
+
+        binding.menuShareUnshare.setOnClickListener(v -> {
+            actions.unShare(ocShare);
+            dismiss();
+        });
+
+        binding.menuShareSendLink.setOnClickListener(v -> {
+            actions.sendLink(ocShare);
+            dismiss();
+        });
+
+        binding.menuShareAddAnotherLink.setOnClickListener(v -> {
+            actions.addAnotherLink(ocShare);
+            dismiss();
+        });
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        binding = null;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java
new file mode 100644
index 000000000..a804511c4
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java
@@ -0,0 +1,32 @@
+package it.niedermann.owncloud.notes.share.listener;
+
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+public interface FileDetailsSharingMenuBottomSheetActions {
+
+    /**
+     * open advanced permission for selected share
+     */
+    void advancedPermissions(OCShare share);
+
+    /**
+     * open note screen to send new email
+     */
+    void sendNewEmail(OCShare share);
+
+    /**
+     * unshare the current share
+     */
+    void unShare(OCShare share);
+
+    /**
+     * send created link only valid for {@link ShareType#PUBLIC_LINK}
+     */
+    void sendLink(OCShare share);
+
+    /**
+     * create another link only valid for {@link ShareType#PUBLIC_LINK}
+     */
+    void addAnotherLink(OCShare share);
+}
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 000000000..0f6e822c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#C4C4C4"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 000000000..9126482d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    tools:ignore="VectorRaster">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
new file mode 100644
index 000000000..216121712
--- /dev/null
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#757575"
+        android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+</vector>
diff --git a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
new file mode 100644
index 000000000..f14b59c14
--- /dev/null
+++ b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/dialog_padding"
+    android:background="@color/bg_default">
+
+    <LinearLayout
+        android:id="@+id/menu_share_advanced_permissions"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1x"
+        android:paddingRight="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1x"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/menu_icon_advanced_permissions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_edit"
+            app:tint="@color/primary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+            android:text="@string/share_settings"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/menu_share_send_new_email"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1x"
+        android:paddingRight="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1x"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/menu_icon_send_new_email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_email"
+            app:tint="@color/primary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+            android:text="@string/share_send_new_email"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/menu_share_send_link"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1x"
+        android:paddingRight="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1x"
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/menu_icon_send_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_link"
+            app:tint="@color/primary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+            android:text="@string/share_via_link_send_link_label"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/menu_share_unshare"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1x"
+        android:paddingRight="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1x"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/menu_icon_unshare"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_delete"
+            app:tint="@color/primary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+            android:text="@string/delete_link"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/menu_share_add_another_link"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/spacer_2x"
+        android:paddingTop="@dimen/spacer_1x"
+        android:paddingRight="@dimen/spacer_2x"
+        android:paddingBottom="@dimen/spacer_1x"
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/menu_icon_add_another_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_plus"
+            app:tint="@color/primary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+            android:text="@string/add_another_public_share_link"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index b3ae42a7a..05f31608c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -13,6 +13,7 @@
 
     <color name="primary">#121212</color>
     <color name="accent">#f5f5f5</color>
+    <color name="text_color">#E3E3E3</color>
 
     <color name="cursorHandles">#eee5e5ee</color>
     <color name="defaultTextHighlightBackground">#55eeeeff</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d504c3391..b1c113295 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
     <color name="primary">#ffffff</color>
     <color name="accent">#121212</color>
     <color name="danger">#d40000</color>
+    <color name="text_color">#333333</color>
 
     <color name="defaultBrand">#0082C9</color>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c2b9ce739..8c3cfa347 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,10 @@
 
     <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
     <dimen name="activity_row_layout_height">48dp</dimen>
-
+    <dimen name="bottom_sheet_text_start_margin">40dp</dimen>
+    <dimen name="bottom_sheet_text_size">16sp</dimen>
+    <dimen name="bottom_sheet_item_height">56dp</dimen>
+    <dimen name="dialog_padding">24dp</dimen>
 
     <dimen name="spacer_activity_sides">0dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a2cdb0e..43159d7b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,7 +61,9 @@
     <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
     <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
     <string name="share_internal_link">Share internal link</string>
-
+    <string name="delete_link">Delete Link</string>
+    <string name="share_settings">Settings</string>
+    <string name="share_send_new_email">Send new email</string>
     <string name="share_dialog_title">Sharing</string>
     <string name="share_file">Share %1$s</string>
     <string name="share_expiration_date_label">Expires %1$s</string>

From 843fda23154d2feaeed676061b0116e16d289d71 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 15:36:41 +0100
Subject: [PATCH 008/138] add QuickSharingPermissionsBottomSheetDialog

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |   5 +-
 .../adapter/QuickSharingPermissionsAdapter.kt |  64 ++++++++
 ...ckSharingPermissionsBottomSheetDialog.java | 146 ++++++++++++++++++
 .../notes/share/model/QuickPermissionModel.kt |   3 +
 .../res/drawable/ic_baseline_check_24.xml     |  16 ++
 .../layout/item_quick_share_permissions.xml   |  42 +++++
 ...ring_permissions_bottom_sheet_fragment.xml |  23 +++
 app/src/main/res/values/strings.xml           |   9 ++
 8 files changed, 306 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/QuickPermissionModel.kt
 create mode 100644 app/src/main/res/drawable/ic_baseline_check_24.xml
 create mode 100644 app/src/main/res/layout/item_quick_share_permissions.xml
 create mode 100644 app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 35a2a0642..5eabb0bc1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -46,6 +46,7 @@
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
@@ -54,7 +55,7 @@
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions {
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
@@ -378,7 +379,7 @@ public void showSharingMenuActionSheet(OCShare share) {
 
     @Override
     public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
     }
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt
new file mode 100644
index 000000000..84e335008
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt
@@ -0,0 +1,64 @@
+package it.niedermann.owncloud.notes.share.adapter
+
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import it.niedermann.owncloud.notes.databinding.ItemQuickSharePermissionsBinding
+import it.niedermann.owncloud.notes.share.model.QuickPermissionModel
+
+class QuickSharingPermissionsAdapter(
+    private val quickPermissionList: MutableList<QuickPermissionModel>,
+    private val onPermissionChangeListener: QuickSharingPermissionViewHolder.OnPermissionChangeListener,
+) :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val binding = ItemQuickSharePermissionsBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return QuickSharingPermissionViewHolder(binding, binding.root, onPermissionChangeListener)
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (holder is QuickSharingPermissionViewHolder) {
+            holder.bindData(quickPermissionList[position])
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return quickPermissionList.size
+    }
+
+    class QuickSharingPermissionViewHolder(
+        val binding: ItemQuickSharePermissionsBinding,
+        itemView: View,
+        val onPermissionChangeListener: OnPermissionChangeListener,
+    ) :
+        RecyclerView
+        .ViewHolder(itemView) {
+
+        fun bindData(quickPermissionModel: QuickPermissionModel) {
+            binding.tvQuickShareName.text = quickPermissionModel.permissionName
+            if (quickPermissionModel.isSelected) {
+                // viewThemeUtils.platform.colorImageView(binding.tvQuickShareCheckIcon)
+                binding.tvQuickShareCheckIcon.visibility = View.VISIBLE
+            } else {
+                binding.tvQuickShareCheckIcon.visibility = View.INVISIBLE
+            }
+
+            itemView.setOnClickListener {
+                // if user select different options then only update the permission
+                if (!quickPermissionModel.isSelected) {
+                    onPermissionChangeListener.onPermissionChanged(adapterPosition)
+                } else {
+                    // dismiss sheet on selection of same permission
+                    onPermissionChangeListener.onDismissSheet()
+                }
+            }
+        }
+
+        interface OnPermissionChangeListener {
+            fun onPermissionChanged(position: Int)
+            fun onDismissSheet()
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
new file mode 100644
index 000000000..e5360c296
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
@@ -0,0 +1,146 @@
+package it.niedermann.owncloud.notes.share.dialog;
+
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
+import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
+
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.databinding.QuickSharingPermissionsBottomSheetFragmentBinding;
+import it.niedermann.owncloud.notes.share.adapter.QuickSharingPermissionsAdapter;
+import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
+import it.niedermann.owncloud.notes.share.model.QuickPermissionModel;
+
+/**
+ * File Details Quick Sharing permissions options {@link android.app.Dialog} styled as a bottom sheet for main actions.
+ */
+public class QuickSharingPermissionsBottomSheetDialog extends BottomSheetDialog {
+    private QuickSharingPermissionsBottomSheetFragmentBinding binding;
+    private final QuickPermissionSharingBottomSheetActions actions;
+    private final Activity activity;
+    private final OCShare ocShare;
+
+    public QuickSharingPermissionsBottomSheetDialog(Activity activity,
+                                                    QuickPermissionSharingBottomSheetActions actions,
+                                                    OCShare ocShare) {
+        super(activity);
+        this.actions = actions;
+        this.ocShare = ocShare;
+        this.activity = activity;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = QuickSharingPermissionsBottomSheetFragmentBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        if (getWindow() != null) {
+            getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        }
+
+        // viewThemeUtils.platform.themeDialog(binding.getRoot());
+
+        setUpRecyclerView();
+        setOnShowListener(d ->
+                BottomSheetBehavior.from((View) binding.getRoot().getParent())
+                        .setPeekHeight(binding.getRoot().getMeasuredHeight())
+        );
+    }
+
+    private void setUpRecyclerView() {
+        List<QuickPermissionModel> quickPermissionModelList = getQuickPermissionList();
+        QuickSharingPermissionsAdapter adapter = new QuickSharingPermissionsAdapter(
+                quickPermissionModelList,
+                new QuickSharingPermissionsAdapter.QuickSharingPermissionViewHolder.OnPermissionChangeListener() {
+                    @Override
+                    public void onPermissionChanged(int position) {
+                        handlePermissionChanged(quickPermissionModelList, position);
+                    }
+
+                    @Override
+                    public void onDismissSheet() {
+                        dismiss();
+                    }
+                }
+        );
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(activity);
+        binding.rvQuickSharePermissions.setLayoutManager(linearLayoutManager);
+        binding.rvQuickSharePermissions.setAdapter(adapter);
+    }
+
+    private void handlePermissionChanged(List<QuickPermissionModel> quickPermissionModelList, int position) {
+        if (quickPermissionModelList.get(position).getPermissionName().equalsIgnoreCase(activity.getResources().getString(R.string.link_share_allow_upload_and_editing))
+                || quickPermissionModelList.get(position).getPermissionName().equalsIgnoreCase(activity.getResources().getString(R.string.link_share_editing))) {
+            if (ocShare.isFolder()) {
+                actions.onQuickPermissionChanged(ocShare,
+                        MAXIMUM_PERMISSIONS_FOR_FOLDER);
+            } else {
+                actions.onQuickPermissionChanged(ocShare,
+                        MAXIMUM_PERMISSIONS_FOR_FILE);
+            }
+        } else if (quickPermissionModelList.get(position).getPermissionName().equalsIgnoreCase(activity.getResources().getString(R.string
+                .link_share_view_only))) {
+            actions.onQuickPermissionChanged(ocShare,
+                    READ_PERMISSION_FLAG);
+
+        } else if (quickPermissionModelList.get(position).getPermissionName().equalsIgnoreCase(activity.getResources().getString(R.string
+                .link_share_file_drop))) {
+            actions.onQuickPermissionChanged(ocShare,
+                    CREATE_PERMISSION_FLAG);
+        }
+        dismiss();
+    }
+
+    /**
+     * prepare the list of permissions needs to be displayed on recyclerview
+     * @return
+     */
+    private List<QuickPermissionModel> getQuickPermissionList() {
+
+        String[] permissionArray;
+        if (ocShare.isFolder()) {
+            permissionArray =
+                    activity.getResources().getStringArray(R.array.folder_share_permission_dialog_values);
+        } else {
+            permissionArray =
+                    activity.getResources().getStringArray(R.array.file_share_permission_dialog_values);
+        }
+        //get the checked item position
+        int checkedItem = SharingMenuHelper.getPermissionCheckedItem(activity, ocShare, permissionArray);
+
+
+        final List<QuickPermissionModel> quickPermissionModelList = new ArrayList<>(permissionArray.length);
+        for (int i = 0; i < permissionArray.length; i++) {
+            QuickPermissionModel quickPermissionModel = new QuickPermissionModel(permissionArray[i], checkedItem == i);
+            quickPermissionModelList.add(quickPermissionModel);
+        }
+        return quickPermissionModelList;
+    }
+
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        binding = null;
+    }
+
+    public interface QuickPermissionSharingBottomSheetActions {
+        void onQuickPermissionChanged(OCShare share, int permission);
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/QuickPermissionModel.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/QuickPermissionModel.kt
new file mode 100644
index 000000000..45e1ccf21
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/QuickPermissionModel.kt
@@ -0,0 +1,3 @@
+package it.niedermann.owncloud.notes.share.model
+
+data class QuickPermissionModel(val permissionName: String, val isSelected: Boolean)
diff --git a/app/src/main/res/drawable/ic_baseline_check_24.xml b/app/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 000000000..c11536bf9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_quick_share_permissions.xml b/app/src/main/res/layout/item_quick_share_permissions.xml
new file mode 100644
index 000000000..a22c075e1
--- /dev/null
+++ b/app/src/main/res/layout/item_quick_share_permissions.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/bottom_sheet_item_height"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="@dimen/spacer_2x"
+    android:paddingEnd="@dimen/spacer_2x">
+
+    <ImageView
+        android:id="@+id/tv_quick_share_check_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:src="@drawable/ic_baseline_check_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/primary" />
+
+    <TextView
+        android:id="@+id/tv_quick_share_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+        android:text="@string/link_share_view_only"
+        android:textColor="@color/text_color"
+        android:textSize="@dimen/bottom_sheet_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/tv_quick_share_check_icon"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
new file mode 100644
index 000000000..ba3d23e8f
--- /dev/null
+++ b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/spacer_2x"
+    android:paddingBottom="@dimen/spacer_2x"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_quick_share_permissions"
+        android:layout_width="match_parent"
+        tools:listitem="@layout/item_quick_share_permissions"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43159d7b4..dccc7b35b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,15 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string-array name="folder_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_allow_upload_and_editing</item>
+        <item>@string/link_share_file_drop</item>
+    </string-array>
+    <string-array name="file_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_editing</item>
+    </string-array>
     <string name="note_share_fragment_share_icon_content_description">note share icon</string>
     <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
     <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>

From 479124ea326c97d37516ae57d29b3aa1db943640 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 15:43:57 +0100
Subject: [PATCH 009/138] add SharePasswordDialogFragment

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |   4 +-
 .../dialog/SharePasswordDialogFragment.kt     | 217 ++++++++++++++++++
 app/src/main/res/layout/password_dialog.xml   |  32 +++
 app/src/main/res/values/strings.xml           |  10 +
 4 files changed, 262 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
 create mode 100644 app/src/main/res/layout/password_dialog.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 5eabb0bc1..d3f0972bf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -34,6 +34,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +49,7 @@
 import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
+import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
@@ -431,7 +433,7 @@ private void unshareWith(OCShare share) {
      * @param askForPassword if true, password is optional
      */
     public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
                 createShare,
                 askForPassword);
         dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
new file mode 100644
index 000000000..4c0bd8b85
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
@@ -0,0 +1,217 @@
+package it.niedermann.owncloud.notes.share.dialog
+
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.TextUtils
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import com.owncloud.android.lib.resources.shares.OCShare
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandedSnackbar
+import it.niedermann.owncloud.notes.databinding.PasswordDialogBinding
+import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.shared.util.KeyboardUtils
+import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
+import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
+
+/**
+ * Dialog to input the password for sharing a file/folder.
+ *
+ *
+ * Triggers the share when the password is introduced.
+ */
+class SharePasswordDialogFragment : DialogFragment() {
+
+    var keyboardUtils: KeyboardUtils? = null
+
+    private var binding: PasswordDialogBinding? = null
+    private var note: Note? = null
+    private var share: OCShare? = null
+    private var createShare = false
+    private var askForPassword = false
+
+    override fun onStart() {
+        super.onStart()
+
+        val alertDialog = dialog as AlertDialog?
+
+        if (alertDialog != null) {
+            val positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) as MaterialButton?
+            if (positiveButton != null) {
+                // viewThemeUtils?.material?.colorMaterialButtonPrimaryTonal(positiveButton)
+                positiveButton.setOnClickListener {
+                    val sharePassword = binding?.sharePassword?.text
+
+                    if (sharePassword != null) {
+                        val password = sharePassword.toString()
+                        if (!askForPassword && TextUtils.isEmpty(password)) {
+                            BrandedSnackbar.make(
+                                binding!!.root,
+                                getString(R.string.share_link_empty_password),
+                                Snackbar.LENGTH_LONG
+                            )
+                                .show()
+                            return@setOnClickListener
+                        }
+                        if (share == null) {
+                            setPassword(createShare, note, password)
+                        } else {
+                            setPassword(share!!, password)
+                        }
+                    }
+
+                    alertDialog.dismiss()
+                }
+            }
+
+            val negativeButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE) as MaterialButton?
+            if (negativeButton != null) {
+                //viewThemeUtils?.material?.colorMaterialButtonPrimaryBorderless(negativeButton)
+            }
+
+            val neutralButton = alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL) as MaterialButton?
+            if (neutralButton != null) {
+                // val warningColorId = ContextCompat.getColor(requireContext(), R.color.highlight_textColor_Warning)
+                //viewThemeUtils?.platform?.colorTextButtons(warningColorId, neutralButton)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        keyboardUtils?.showKeyboardForEditText(binding!!.sharePassword)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        note = requireArguments().getSerializableArgument(ARG_FILE, Note::class.java)
+        share = requireArguments().getParcelableArgument(ARG_SHARE, OCShare::class.java)
+
+        createShare = requireArguments().getBoolean(ARG_CREATE_SHARE, false)
+        askForPassword = requireArguments().getBoolean(ARG_ASK_FOR_PASSWORD, false)
+
+        // Inflate the layout for the dialog
+        val inflater = requireActivity().layoutInflater
+        binding = PasswordDialogBinding.inflate(inflater, null, false)
+
+        // Setup layout
+        binding?.sharePassword?.setText(R.string.empty)
+       // viewThemeUtils?.material?.colorTextInputLayout(binding!!.sharePasswordContainer)
+
+        val neutralButtonTextId: Int
+        val title: Int
+        if (askForPassword) {
+            title = R.string.share_link_optional_password_title
+            neutralButtonTextId = R.string.common_skip
+        } else {
+            title = R.string.share_link_password_title
+            neutralButtonTextId = R.string.common_cancel
+        }
+
+        // Build the dialog
+        val builder = MaterialAlertDialogBuilder(requireContext())
+        builder.setView(binding!!.root)
+            .setPositiveButton(R.string.common_ok, null)
+            .setNegativeButton(R.string.common_delete) { _: DialogInterface?, _: Int -> callSetPassword() }
+            .setNeutralButton(neutralButtonTextId) { _: DialogInterface?, _: Int ->
+                if (askForPassword) {
+                    callSetPassword()
+                }
+            }
+            .setTitle(title)
+
+        // viewThemeUtils?.dialog?.colorMaterialAlertDialogBackground(requireContext(), builder)
+
+        return builder.create()
+    }
+
+    private fun callSetPassword() {
+        if (share == null) {
+            setPassword(createShare, note, null)
+        } else {
+            setPassword(share!!, null)
+        }
+    }
+
+    private fun setPassword(createShare: Boolean, note: Note?, password: String?) {
+        val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
+        if (createShare) {
+            fileOperationsHelper.shareFileViaPublicShare(note, password)
+        } else {
+            fileOperationsHelper.setPasswordToShare(share, password)
+        }
+    }
+
+    private fun setPassword(share: OCShare, password: String?) {
+        val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
+        fileOperationsHelper.setPasswordToShare(share, password)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
+    companion object {
+        private const val ARG_FILE = "FILE"
+        private const val ARG_SHARE = "SHARE"
+        private const val ARG_CREATE_SHARE = "CREATE_SHARE"
+        private const val ARG_ASK_FOR_PASSWORD = "ASK_FOR_PASSWORD"
+        const val PASSWORD_FRAGMENT = "PASSWORD_FRAGMENT"
+
+        /**
+         * Public factory method to create new SharePasswordDialogFragment instances.
+         *
+         * @param file        OCFile bound to the public share that which
+         * password will be set or updated
+         * @param createShare When 'true', the request for password will be
+         * followed by the creation of a new public link
+         * when 'false', a public share is assumed to exist, and the password is bound to it.
+         * @return Dialog ready to show.
+         */
+        @JvmStatic
+        fun newInstance(note: Note?, createShare: Boolean, askForPassword: Boolean): SharePasswordDialogFragment {
+            val frag = SharePasswordDialogFragment()
+            val args = Bundle()
+            args.putSerializable(ARG_FILE, note)
+            args.putBoolean(ARG_CREATE_SHARE, createShare)
+            args.putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
+            frag.arguments = args
+            return frag
+        }
+
+        /**
+         * Public factory method to create new SharePasswordDialogFragment instances.
+         *
+         * @param share OCFile bound to the public share that which password will be set or updated
+         * @return Dialog ready to show.
+         */
+        @JvmStatic
+        fun newInstance(share: OCShare?, askForPassword: Boolean): SharePasswordDialogFragment {
+            val frag = SharePasswordDialogFragment()
+            val args = Bundle()
+            args.putParcelable(ARG_SHARE, share)
+            args.putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
+            frag.arguments = args
+            return frag
+        }
+
+        /**
+         * Public factory method to create new SharePasswordDialogFragment instances.
+         *
+         * @param share OCFile bound to the public share that which password will be set or updated
+         * @return Dialog ready to show.
+         */
+        fun newInstance(share: OCShare?): SharePasswordDialogFragment {
+            val frag = SharePasswordDialogFragment()
+            val args = Bundle()
+            args.putParcelable(ARG_SHARE, share)
+            frag.arguments = args
+            return frag
+        }
+    }
+}
diff --git a/app/src/main/res/layout/password_dialog.xml b/app/src/main/res/layout/password_dialog.xml
new file mode 100644
index 000000000..f56b06660
--- /dev/null
+++ b/app/src/main/res/layout/password_dialog.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/spacer_2x">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/share_password_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_password">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/share_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="password"
+            android:ems="10"
+            android:gravity="top"
+            android:inputType="textPassword">
+
+        </com.google.android.material.textfield.TextInputEditText>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dccc7b35b..624ee75f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,6 +61,16 @@
     <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
     <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
     <string name="contact_no_permission">Contact permission is required.</string>
+    <string name="share_link_empty_password">You must enter a password</string>
+    <string name="hint_password">Password</string>
+    <string name="share_link_optional_password_title">Enter an optional password</string>
+    <string name="common_skip">Skip</string>
+    <string name="common_cancel">Cancel</string>
+    <string name="empty" translatable="false" />
+    <string name="share_link_password_title">Enter a password</string>
+    <string name="common_ok">OK</string>
+    <string name="common_delete">Delete</string>
+
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>
     <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>

From 1847eda75e5fb61157569b5639774f25a5a449e8 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 16:40:11 +0100
Subject: [PATCH 010/138] add RetrieveHoverCardAsyncTask

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareFragment.java        |   8 +-
 .../share/dialog/ProfileBottomSheetDialog.kt  | 155 ++++++++++++++++++
 .../notes/share/operations/ClientFactory.java |  58 +++++++
 .../RetrieveHoverCardAsyncTask.java           |  73 +++++++++
 .../notes/shared/util/DisplayUtils.java       |  81 +++++++++
 app/src/main/res/drawable/ic_talk.xml         |  18 ++
 .../layout/profile_bottom_sheet_action.xml    |  37 +++++
 .../layout/profile_bottom_sheet_fragment.xml  |  62 +++++++
 app/src/main/res/values/strings.xml           |   4 +
 9 files changed, 493 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
 create mode 100644 app/src/main/res/drawable/ic_talk.xml
 create mode 100644 app/src/main/res/layout/profile_bottom_sheet_action.xml
 create mode 100644 app/src/main/res/layout/profile_bottom_sheet_fragment.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index d3f0972bf..fa7988124 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -53,7 +53,9 @@
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
@@ -449,10 +451,10 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     public void showProfileBottomSheet(User user, String shareWith) {
         if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
             new RetrieveHoverCardAsyncTask(user,
+                    account,
                     shareWith,
-                    fileActivity,
-                    clientFactory,
-                    viewThemeUtils).execute();
+                    getActivity(),
+                    clientFactory).execute();
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
new file mode 100644
index 000000000..c2f99ae30
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
@@ -0,0 +1,155 @@
+package it.niedermann.owncloud.notes.share.dialog
+
+
+import android.content.ActivityNotFoundException
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.FragmentActivity
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.nextcloud.android.lib.resources.profile.Action
+import com.nextcloud.android.lib.resources.profile.HoverCard
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetActionBinding
+import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetFragmentBinding
+import it.niedermann.owncloud.notes.persistence.entity.Account
+import it.niedermann.owncloud.notes.shared.user.User
+import it.niedermann.owncloud.notes.shared.util.DisplayUtils
+
+/**
+ * Show actions of an user
+ */
+class ProfileBottomSheetDialog(
+    private val fileActivity: FragmentActivity,
+    private val user: User,
+    private val account: Account,
+    private val hoverCard: HoverCard,
+) : BottomSheetDialog(fileActivity) {
+    private var _binding: ProfileBottomSheetFragmentBinding? = null
+
+    // This property is only valid between onCreateView and onDestroyView.
+    val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = ProfileBottomSheetFragmentBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        if (window != null) {
+            window!!.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        }
+
+        // viewThemeUtils.platform.themeDialog(binding.root)
+
+        binding.icon.tag = hoverCard.userId
+
+
+        /*
+            // TODO: How to get owner display name from note?
+
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
+        Glide.with(fileActivity)
+            .load(
+                SingleSignOnUrl(
+                    account.accountName,
+                    account.url + "/index.php/avatar/" + Uri.encode(account.userName) + "/64"
+                )
+            )
+            .placeholder(R.drawable.ic_account_circle_grey_24dp)
+            .error(R.drawable.ic_account_circle_grey_24dp)
+            .apply(RequestOptions.circleCropTransform())
+            .into(binding.icon)
+
+        binding.displayName.text = hoverCard.displayName
+
+        for (action in hoverCard.actions) {
+            val actionBinding = ProfileBottomSheetActionBinding.inflate(
+                layoutInflater
+            )
+            val creatorView: View = actionBinding.root
+
+            if (action.appId == "email") {
+                action.hyperlink = action.title
+                action.title = context.resources.getString(R.string.write_email)
+            }
+
+            actionBinding.name.text = action.title
+
+            val icon = when (action.appId) {
+                "profile" -> R.drawable.ic_account_circle_grey_24dp
+                "email" -> R.drawable.ic_email
+                "spreed" -> R.drawable.ic_talk
+                else -> R.drawable.ic_edit
+            }
+            actionBinding.icon.setImageDrawable(
+                ResourcesCompat.getDrawable(
+                    context.resources,
+                    icon,
+                    null
+                )
+            )
+            // viewThemeUtils.platform.tintPrimaryDrawable(context, actionBinding.icon.drawable)
+
+            creatorView.setOnClickListener { v: View? ->
+                send(hoverCard.userId, action)
+                dismiss()
+            }
+            binding.creators.addView(creatorView)
+        }
+
+        setOnShowListener { d: DialogInterface? ->
+            BottomSheetBehavior.from(binding.root.parent as View)
+                .setPeekHeight(binding.root.measuredHeight)
+        }
+    }
+
+    private fun send(userId: String, action: Action) {
+        when (action.appId) {
+            "profile" -> openWebsite(action.hyperlink)
+            "core" -> sendEmail(action.hyperlink)
+            "spreed" -> openTalk(userId, action.hyperlink)
+        }
+    }
+
+    private fun openWebsite(url: String) {
+        DisplayUtils.startLinkIntent(fileActivity, url)
+    }
+
+    private fun sendEmail(email: String) {
+        val intent = Intent(Intent.ACTION_SENDTO).apply {
+            data = Uri.parse("mailto:")
+            putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+        }
+
+        DisplayUtils.startIntentIfAppAvailable(intent, fileActivity, R.string.no_email_app_available)
+    }
+
+    private fun openTalk(userId: String, hyperlink: String) {
+        try {
+            val sharingIntent = Intent(Intent.ACTION_VIEW)
+            sharingIntent.setClassName(
+                "com.nextcloud.talk2",
+                "com.nextcloud.talk.activities.MainActivity"
+            )
+            sharingIntent.putExtra("server", user.server.uri)
+            sharingIntent.putExtra("userId", userId)
+            fileActivity.startActivity(sharingIntent)
+        } catch (e: ActivityNotFoundException) {
+            openWebsite(hyperlink)
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
new file mode 100644
index 000000000..6b6db5748
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
@@ -0,0 +1,58 @@
+package it.niedermann.owncloud.notes.share.operations;
+
+
+import android.accounts.Account;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.net.Uri;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.PlainClient;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+
+import java.io.IOException;
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public interface ClientFactory {
+
+    /**
+     * This exception wraps all possible errors thrown by trigger-happy OwnCloudClient constructor, making try-catch
+     * blocks manageable.
+     * <p>
+     * This is a temporary refactoring measure, until a better error handling method can be procured.
+     */
+    @Deprecated
+    class CreationException extends Exception {
+
+        private static final long serialVersionUID = 0L;
+
+        CreationException(Throwable t) {
+            super(t);
+        }
+    }
+
+    OwnCloudClient create(User user) throws CreationException;
+
+    NextcloudClient createNextcloudClient(User user) throws CreationException;
+
+    @Deprecated
+    OwnCloudClient create(Account account)
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            AccountUtils.AccountNotFoundException;
+
+    @Deprecated
+    OwnCloudClient create(Account account, Activity currentActivity)
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            AccountUtils.AccountNotFoundException;
+
+    OwnCloudClient create(Uri uri,
+                          boolean followRedirects,
+                          boolean useNextcloudUserAgent);
+
+    OwnCloudClient create(Uri uri, boolean followRedirects);
+
+    PlainClient createPlainClient();
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
new file mode 100644
index 000000000..507109cca
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
@@ -0,0 +1,73 @@
+package it.niedermann.owncloud.notes.share.operations;
+
+
+import android.os.AsyncTask;
+
+import com.nextcloud.android.lib.resources.profile.GetHoverCardRemoteOperation;
+import com.nextcloud.android.lib.resources.profile.HoverCard;
+import com.nextcloud.common.NextcloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
+import java.lang.ref.WeakReference;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Lifecycle;
+
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.dialog.ProfileBottomSheetDialog;
+import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
+
+public class RetrieveHoverCardAsyncTask extends AsyncTask<Void, Void, HoverCard> {
+    private final User user;
+    private final Account account;
+    private final String userId;
+    private final WeakReference<FragmentActivity> activityWeakReference;
+    private final ClientFactory clientFactory;
+
+    public RetrieveHoverCardAsyncTask(User user,
+                                      Account account,
+                                      String userId,
+                                      FragmentActivity activity,
+                                      ClientFactory clientFactory) {
+        this.user = user;
+        this.account = account;
+        this.userId = userId;
+        this.activityWeakReference = new WeakReference<>(activity);
+        this.clientFactory = clientFactory;
+    }
+
+    @Override
+    protected HoverCard doInBackground(Void... voids) {
+        try {
+            NextcloudClient client = clientFactory.createNextcloudClient(user);
+            RemoteOperationResult<HoverCard> result = new GetHoverCardRemoteOperation(userId).execute(client);
+
+            if (result.isSuccess()) {
+                return result.getResultData();
+            } else {
+                return null;
+            }
+        } catch (ClientFactory.CreationException | NullPointerException e) {
+            return null;
+        }
+    }
+
+    @Override
+    protected void onPostExecute(HoverCard hoverCard) {
+        FragmentActivity activity = this.activityWeakReference.get();
+
+        if (activity != null && activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
+            if (hoverCard.getActions().size() > 0) {
+                new ProfileBottomSheetDialog(activity,
+                        user,
+                        account,
+                        hoverCard)
+                        .show();
+            } else {
+                DisplayUtils.showSnackMessage(activity, R.string.no_actions);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java
index e59939d47..a8c97a2ab 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java
@@ -10,18 +10,25 @@
 import static java.util.Collections.singletonList;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Build;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.WindowInsets;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -108,4 +115,78 @@ public static boolean isSoftKeyboardVisible(@NonNull View parentView) {
         final int heightDiff = parentView.getRootView().getHeight() - (rect.bottom - rect.top);
         return heightDiff >= estimatedKeyboardHeight;
     }
+
+    static public void startLinkIntent(Activity activity, @StringRes int link) {
+        startLinkIntent(activity, activity.getString(link));
+    }
+
+    static public void startLinkIntent(Activity activity, String url) {
+        if (!TextUtils.isEmpty(url)) {
+            startLinkIntent(activity, Uri.parse(url));
+        }
+    }
+
+    static public void startLinkIntent(Activity activity, Uri uri) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        DisplayUtils.startIntentIfAppAvailable(intent, activity, R.string.no_browser_available);
+    }
+
+    static public void startIntentIfAppAvailable(Intent intent, Activity activity, @StringRes int error) {
+        if (intent.resolveActivity(activity.getPackageManager()) != null) {
+            activity.startActivity(intent);
+        } else {
+            DisplayUtils.showSnackMessage(activity, error);
+        }
+    }
+
+    /**
+     * Show a temporary message in a {@link Snackbar} bound to the content view.
+     *
+     * @param activity        The {@link Activity} to which's content view the {@link Snackbar} is bound.
+     * @param messageResource The resource id of the string resource to use. Can be formatted text.
+     * @return The created {@link Snackbar}
+     */
+    public static Snackbar showSnackMessage(Activity activity, @StringRes int messageResource) {
+        return showSnackMessage(activity.findViewById(android.R.id.content), messageResource);
+    }
+
+    /**
+     * Show a temporary message in a {@link Snackbar} bound to the content view.
+     *
+     * @param activity The {@link Activity} to which's content view the {@link Snackbar} is bound.
+     * @param message  Message to show.
+     * @return The created {@link Snackbar}
+     */
+    public static Snackbar showSnackMessage(Activity activity, String message) {
+        final Snackbar snackbar = Snackbar.make(activity.findViewById(android.R.id.content), message, Snackbar.LENGTH_LONG);
+        snackbar.show();
+        return snackbar;
+    }
+
+    /**
+     * Show a temporary message in a {@link Snackbar} bound to the given view.
+     *
+     * @param view            The view the {@link Snackbar} is bound to.
+     * @param messageResource The resource id of the string resource to use. Can be formatted text.
+     * @return The created {@link Snackbar}
+     */
+    public static Snackbar showSnackMessage(View view, @StringRes int messageResource) {
+        final Snackbar snackbar = Snackbar.make(view, messageResource, Snackbar.LENGTH_LONG);
+        snackbar.show();
+        return snackbar;
+    }
+
+    /**
+     * Show a temporary message in a {@link Snackbar} bound to the given view.
+     *
+     * @param view    The view the {@link Snackbar} is bound to.
+     * @param message The message.
+     * @return The created {@link Snackbar}
+     */
+    public static Snackbar showSnackMessage(View view, String message) {
+        final Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
+        snackbar.show();
+        return snackbar;
+    }
+
 }
diff --git a/app/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml
new file mode 100644
index 000000000..8957c64bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_talk.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:autoMirrored="true"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m7.9992,0.999a6.9993,6.9994 0,0 0,-6.9992 6.9996,6.9993 6.9994,0 0,0 6.9992,6.9994 6.9993,6.9994 0,0 0,3.6308 -1.024c0.8602,0.3418 2.7871,1.356 3.2457,0.9179 0.4792,-0.4577 -0.5626,-2.6116 -0.8124,-3.412a6.9993,6.9994 0,0 0,0.935 -3.4814,6.9993 6.9994,0 0,0 -6.9991,-6.9993zM8,3.6601a4.34,4.3401 0,0 1,4.34 4.3401,4.34 4.3401,0 0,1 -4.34,4.3398 4.34,4.3401 0,0 1,-4.34 -4.3398,4.34 4.3401,0 0,1 4.34,-4.3401z"
+        android:strokeWidth=".14" />
+</vector>
diff --git a/app/src/main/res/layout/profile_bottom_sheet_action.xml b/app/src/main/res/layout/profile_bottom_sheet_action.xml
new file mode 100644
index 000000000..06c5e60be
--- /dev/null
+++ b/app/src/main/res/layout/profile_bottom_sheet_action.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingStart="24dp"
+    android:paddingTop="@dimen/spacer_1x"
+    android:paddingEnd="@dimen/spacer_2x"
+    android:paddingBottom="@dimen/spacer_1x"
+    tools:ignore="UseCompoundDrawables">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:contentDescription="@null"
+        tools:src="@drawable/ic_email" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:paddingStart="24dp"
+        android:paddingEnd="0dp"
+        tools:text="Compose email"
+        android:textColor="@color/text_color"
+        android:textSize="@dimen/bottom_sheet_text_size" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/profile_bottom_sheet_fragment.xml b/app/src/main/res/layout/profile_bottom_sheet_fragment.xml
new file mode 100644
index 000000000..377473125
--- /dev/null
+++ b/app/src/main/res/layout/profile_bottom_sheet_fragment.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/bottom_sheet_item_height"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="@dimen/default_icon_size"
+            android:layout_height="@dimen/default_icon_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="@dimen/spacer_1x"
+            android:layout_marginEnd="@dimen/spacer_2x"
+            android:layout_marginLeft="@dimen/spacer_2x"
+            android:layout_marginRight="@dimen/spacer_2x"
+            android:layout_marginStart="@dimen/spacer_2x"
+            android:layout_marginTop="@dimen/spacer_1x"
+            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:src="@drawable/ic_account_circle_grey_24dp" />
+
+        <TextView
+            android:id="@+id/displayName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingTop="@dimen/spacer_2x"
+            android:paddingBottom="@dimen/spacer_2x"
+            tools:text="Christine Scott"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/bottom_sheet_text_size" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/action_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="visible"
+        tools:visibility="visible">
+
+        <LinearLayout
+            android:id="@+id/creators"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"></LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 624ee75f3..d9d54f272 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,6 +70,10 @@
     <string name="share_link_password_title">Enter a password</string>
     <string name="common_ok">OK</string>
     <string name="common_delete">Delete</string>
+    <string name="write_email">Send email</string>
+    <string name="no_browser_available">No app available to handle links</string>
+    <string name="no_email_app_available">No App available to handle mail address</string>
+    <string name="no_actions">No actions for this user</string>
 
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>

From 12856e9b4aa5fa4094c91775cba9f185e9004ad6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:06:51 +0100
Subject: [PATCH 011/138] first successfull build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |  9 +-
 .../notes/share/NoteShareFragment.java        | 72 ++++++++--------
 .../adapter/holder/LinkShareViewHolder.java   | 12 +--
 .../dialog/SharePasswordDialogFragment.kt     |  8 +-
 .../share/operations/ClientFactoryImpl.java   | 84 +++++++++++++++++++
 app/src/main/res/layout/activity_row.xml      |  2 +-
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 135 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java

diff --git a/app/build.gradle b/app/build.gradle
index 79c211f4e..088e7628a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,12 +95,17 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
+    implementation 'com.google.guava:guava:31.1-android'
+    implementation ('commons-httpclient:commons-httpclient:3.1') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+
+    implementation("com.github.nextcloud:android-library:2.19.0") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
+    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index fa7988124..759c8a8f0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -6,6 +6,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -24,6 +25,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -31,6 +33,7 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -53,10 +56,9 @@
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
-import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
 public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
@@ -73,6 +75,7 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
     private Account account;
 
     private OnEditShareListener onEditShareListener;
+    private ClientFactoryImpl clientFactory;
 
     public static NoteShareFragment newInstance(Note note, User user, Account account) {
         NoteShareFragment fragment = new NoteShareFragment();
@@ -88,6 +91,8 @@ public static NoteShareFragment newInstance(Note note, User user, Account accoun
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        clientFactory = new ClientFactoryImpl(requireContext());
+
         if (savedInstanceState != null) {
             note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
             account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
@@ -307,6 +312,7 @@ private String createInternalLink() {
 
     // TODO: Capabilities in notes app doesn't have following functions...
     public void createPublicShareLink() {
+        /*
         if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
                 capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
             // password enforced by server, request to the user before trying to create
@@ -326,10 +332,12 @@ public void createPublicShareLink() {
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
+         */
+
     }
 
     public void createSecureFileDrop() {
-        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
     }
 
     /*
@@ -354,6 +362,7 @@ public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewTheme
     }
      */
     private void showSendLinkTo(OCShare publicShare) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(publicShare.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -362,9 +371,12 @@ private void showSendLinkTo(OCShare publicShare) {
                 showShareLinkDialog();
             }
         }
+         */
+
     }
 
     public void copyLink(OCShare share) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(share.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -372,6 +384,8 @@ public void copyLink(OCShare share) {
                 ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
             }
         }
+         */
+
     }
 
     @Override
@@ -386,26 +400,6 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
     }
 
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @param file   the edited {@link OCFile}
-     * @see #onUpdateShareInformation(RemoteOperationResult)
-     */
-    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
-        this.file = file;
-
-        onUpdateShareInformation(result);
-    }
-
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
-     * OCFile held by this fragment}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
-     */
     public void onUpdateShareInformation(RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshUiFromDB();
@@ -424,7 +418,7 @@ private void refreshUiFromDB() {
     }
 
     private void unshareWith(OCShare share) {
-        fileOperationsHelper.unshareShare(file, share);
+        // fileOperationsHelper.unshareShare(file, share);
     }
 
     /**
@@ -462,7 +456,7 @@ public void showProfileBottomSheet(User user, String shareWith) {
      * Get known server capabilities from DB
      */
     public void refreshCapabilitiesFromDB() {
-        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
     /**
@@ -470,6 +464,7 @@ public void refreshCapabilitiesFromDB() {
      * before reading database.
      */
     public void refreshSharesFromDB() {
+        /*
         OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
         if (newFile != null) {
             file = newFile;
@@ -499,8 +494,7 @@ public void refreshSharesFromDB() {
                 ShareType.PUBLIC_LINK,
                 "");
 
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
-                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
             final OCShare ocShare = new OCShare();
             ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
             publicShares.add(ocShare);
@@ -509,10 +503,12 @@ public void refreshSharesFromDB() {
         }
 
         adapter.addShares(publicShares);
+         */
+
     }
 
     private void checkContactPermission() {
-        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
             pickContactEmail();
         } else {
             requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
@@ -534,7 +530,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
         // Define the projection to get all email addresses.
         String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
 
-        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
 
         if (cursor != null) {
             if (cursor.moveToFirst()) {
@@ -584,19 +580,17 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putParcelable(ARG_USER, user);
     }
 
-    @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
     }
 
-    @Override
     public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
         return false;
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return ShareType.FEDERATED == share.getShareType() ||
-                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+        return false;
+        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -607,13 +601,13 @@ public void search(String query) {
 
     @Override
     public void advancedPermissions(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
     }
 
 
     @Override
     public void sendNewEmail(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
     }
 
     @Override
@@ -630,11 +624,14 @@ public void unShare(OCShare share) {
 
     @Override
     public void sendLink(OCShare share) {
+        /*
         if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
             FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
         } else {
             showSendLinkTo(share);
         }
+         */
+
     }
 
     @Override
@@ -643,13 +640,12 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
-                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
     }
 
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
-        fileOperationsHelper.setPermissionsToShare(share, permission);
+       // fileOperationsHelper.setPermissionsToShare(share, permission);
     }
 
     //launcher for contact permission
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
index 5b03f8ceb..9253f8c8c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
@@ -9,7 +9,6 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.nextcloud.android.lib.resources.files.FileDownloadLimit;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
@@ -59,16 +58,7 @@ public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
             // viewThemeUtils.platform.colorImageViewBackgroundAndIcon(binding.icon);
         }
 
-        FileDownloadLimit downloadLimit = publicShare.getFileDownloadLimit();
-        if (downloadLimit != null && downloadLimit.getLimit() > 0) {
-            int remaining = downloadLimit.getLimit() - downloadLimit.getCount();
-            String text = context.getResources().getQuantityString(R.plurals.share_download_limit_description, remaining, remaining);
-
-            binding.subline.setText(text);
-            binding.subline.setVisibility(View.VISIBLE);
-        } else {
-            binding.subline.setVisibility(View.GONE);
-        }
+        binding.subline.setVisibility(View.GONE);
 
         String permissionName = SharingMenuHelper.getPermissionName(context, publicShare);
         setPermissionName(publicShare, permissionName);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
index 4c0bd8b85..7652c0e40 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
@@ -138,17 +138,23 @@ class SharePasswordDialogFragment : DialogFragment() {
     }
 
     private fun setPassword(createShare: Boolean, note: Note?, password: String?) {
+        /*
         val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
         if (createShare) {
             fileOperationsHelper.shareFileViaPublicShare(note, password)
         } else {
             fileOperationsHelper.setPasswordToShare(share, password)
         }
+         */
+
     }
 
     private fun setPassword(share: OCShare, password: String?) {
-        val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
+        /*
+         val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
         fileOperationsHelper.setPasswordToShare(share, password)
+         */
+
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java
new file mode 100644
index 000000000..b9c82d25e
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.share.operations;
+
+import android.accounts.Account;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.PlainClient;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+
+import java.io.IOException;
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public class ClientFactoryImpl implements ClientFactory {
+
+    private Context context;
+
+    public ClientFactoryImpl(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public OwnCloudClient create(User user) throws CreationException {
+        try {
+            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
+        } catch (OperationCanceledException |
+            AuthenticatorException |
+            IOException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public NextcloudClient createNextcloudClient(User user) throws CreationException {
+        try {
+            return OwnCloudClientFactory.createNextcloudClient(user, context);
+        } catch (AccountUtils.AccountNotFoundException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public OwnCloudClient create(Account account)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context);
+    }
+
+    @Override
+    public OwnCloudClient create(Account account, Activity currentActivity)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public PlainClient createPlainClient() {
+        return new PlainClient(context);
+    }
+}
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index e30c1366e..8d6e4d150 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/activity_icon" />
+        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9d54f272..944bfa5c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_editing</item>
     </string-array>
+    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
     <string name="note_share_fragment_share_icon_content_description">note share icon</string>
     <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
     <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>

From a27b91d9c98fd20d82be13758dc9504b5dbf83b9 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:26:08 +0100
Subject: [PATCH 012/138] dont use user

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../main/MultiSelectedActionModeCallback.java | 30 +++++++++++++++++
 .../notes/share/NoteShareFragment.java        | 33 ++++++++-----------
 .../share/adapter/ShareeListAdapter.java      |  7 ----
 .../share/adapter/holder/ShareViewHolder.java |  5 +--
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
index 9996562ad..4c192d01e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -18,6 +18,7 @@
 import androidx.appcompat.view.ActionMode.Callback;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.selection.SelectionTracker;
 
@@ -31,6 +32,7 @@
 import it.niedermann.owncloud.notes.accountpicker.AccountPickerDialogFragment;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.edit.category.CategoryDialogFragment;
+import it.niedermann.owncloud.notes.share.NoteShareFragment;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 
 public class MultiSelectedActionModeCallback implements Callback {
@@ -153,6 +155,32 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             }
             tracker.clearSelection();
 
+            if (selection.size() == 1) {
+                final var currentAccount$ = mainViewModel.getCurrentAccount();
+                currentAccount$.observe(lifecycleOwner, account -> {
+                    currentAccount$.removeObservers(lifecycleOwner);
+                    executor.submit(() -> {{
+                        final var note = mainViewModel.getFullNote(selection.get(0));
+                        final var noteShareFragment = NoteShareFragment.newInstance(note, account);
+                        fragmentManager.findFragmentById(R.id.fragment_container_view);
+                        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+                        fragmentTransaction.replace(android.R.id.content, noteShareFragment);
+                        fragmentTransaction.commit();
+                    }});
+                });
+            } else {
+                ShareUtil.openShareDialog(context,
+                        context.getResources().getQuantityString(R.plurals.share_multiple, selection.size(), selection.size()),
+                        mainViewModel.collectNoteContents(selection));
+            }
+
+            /*
+             final var selection = new ArrayList<Long>(tracker.getSelection().size());
+            for (final var sel : tracker.getSelection()) {
+                selection.add(sel);
+            }
+            tracker.clearSelection();
+
             executor.submit(() -> {
                 if (selection.size() == 1) {
                     final var note = mainViewModel.getFullNote(selection.get(0));
@@ -163,6 +191,8 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                             mainViewModel.collectNoteContents(selection));
                 }
             });
+             */
+
             return true;
         } else if (itemId == R.id.menu_category) {// TODO detect whether all selected notes do have the same category - in this case preselect it
             final var accountLiveData = mainViewModel.getCurrentAccount();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 759c8a8f0..2302cc089 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -71,18 +71,15 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
 
     private FragmentNoteShareBinding binding;
     private Note note;
-    private User user;
     private Account account;
 
-    private OnEditShareListener onEditShareListener;
     private ClientFactoryImpl clientFactory;
 
-    public static NoteShareFragment newInstance(Note note, User user, Account account) {
+    public static NoteShareFragment newInstance(Note note, Account account) {
         NoteShareFragment fragment = new NoteShareFragment();
         Bundle args = new Bundle();
         args.putSerializable(ARG_NOTE, note);
         args.putSerializable(ARG_ACCOUNT, account);
-        args.putParcelable(ARG_USER, user);
         fragment.setArguments(args);
         return fragment;
     }
@@ -96,13 +93,11 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
             account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
-            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
         } else {
             Bundle arguments = getArguments();
             if (arguments != null) {
                 note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
                 account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
-                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
             }
         }
 
@@ -110,7 +105,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             throw new IllegalArgumentException("Note cannot be null");
         }
 
-        if (user == null) {
+        if (account == null) {
             throw new IllegalArgumentException("Account cannot be null");
         }
     }
@@ -130,7 +125,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
                 new ArrayList<>(),
                 this,
-                user,
                 account));
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
@@ -148,16 +142,6 @@ public void onDestroyView() {
         binding = null;
     }
 
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        try {
-            onEditShareListener = (OnEditShareListener) context;
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Calling activity must implement the interface", e);
-        }
-    }
-
     @Override
     public void onStart() {
         super.onStart();
@@ -577,7 +561,6 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putSerializable(ARG_NOTE, note);
         outState.putSerializable(ARG_ACCOUNT, account);
-        outState.putParcelable(ARG_USER, user);
     }
 
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
@@ -640,7 +623,7 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        // editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
     }
 
     @Override
@@ -683,6 +666,16 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                         }
                     });
 
+    // TODO: IMPLEMENT
+    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown, boolean isExpiryDateShown) {
+
+    }
+
+    // TODO: IMPLEMENT
+    public void onShareProcessClosed() {
+
+    }
+
     public interface OnEditShareListener {
         void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
                                boolean isExpiryDateShown);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index d9331c810..d37a7fc36 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -27,7 +27,6 @@
 import it.niedermann.owncloud.notes.share.adapter.holder.NewLinkShareViewHolder;
 import it.niedermann.owncloud.notes.share.adapter.holder.ShareViewHolder;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.shared.user.User;
 
 /**
  * Adapter to show a user/group/email/remote in Sharing list in file details view.
@@ -38,20 +37,15 @@ public class ShareeListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private final ShareeListAdapterListener listener;
     private final Activity activity;
     private List<OCShare> shares;
-    private final float avatarRadiusDimension;
-    private final User user;
 
     public ShareeListAdapter(Activity activity,
                              List<OCShare> shares,
                              ShareeListAdapterListener listener,
-                             User user,
                              Account account) {
         this.activity = activity;
         this.shares = shares;
         this.listener = listener;
-        this.user = user;
         this.account = account;
-        avatarRadiusDimension = activity.getResources().getDimension(R.dimen.default_icon_size);
 
         sortShares();
     }
@@ -89,7 +83,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         parent,
                         false),
                         account,
-                        user,
                         activity);
             }
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 0d6eec7df..6e79ae8e2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -25,7 +25,6 @@
 
 public class ShareViewHolder extends RecyclerView.ViewHolder {
     private ItemShareShareBinding binding;
-    private User user;
     private Account account;
     private Context context;
 
@@ -35,11 +34,9 @@ public ShareViewHolder(@NonNull View itemView) {
 
     public ShareViewHolder(ItemShareShareBinding binding,
                            Account account,
-                           User user,
                            Context context) {
         this(binding.getRoot());
         this.binding = binding;
-        this.user = user;
         this.account = account;
         this.context = context;
     }
@@ -76,7 +73,7 @@ public void bind(OCShare share,
                         .apply(RequestOptions.circleCropTransform())
                         .into(binding.icon);
 
-                binding.icon.setOnClickListener(v -> listener.showProfileBottomSheet(user, share.getShareWith()));
+                // binding.icon.setOnClickListener(v -> listener.showProfileBottomSheet(user, share.getShareWith()));
             default:
                 setImage(binding.icon, name, R.drawable.ic_account_circle_grey_24dp);
                 break;

From 635ba0e16015003796016e9d2a3d87093a1b7d1b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:38:47 +0100
Subject: [PATCH 013/138] convert to activity

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |   3 +
 .../owncloud/notes/main/MainActivity.java     |   2 +-
 .../main/MultiSelectedActionModeCallback.java |  20 ++-
 ...reFragment.java => NoteShareActivity.java} | 135 ++++++------------
 ...note_share.xml => activity_note_share.xml} |   0
 5 files changed, 64 insertions(+), 96 deletions(-)
 rename app/src/main/java/it/niedermann/owncloud/notes/share/{NoteShareFragment.java => NoteShareActivity.java} (82%)
 rename app/src/main/res/layout/{fragment_note_share.xml => activity_note_share.xml} (100%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4427996f..3db3e24f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,9 @@
                 android:value=".android.activity.NotesListViewActivity" />
         </activity>
 
+        <activity
+            android:name=".share.NoteShareActivity" />
+
         <activity
             android:name=".importaccount.ImportAccountActivity"
             android:label="@string/add_account" />
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index 159c41d0f..d75a99130 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -512,7 +512,7 @@ public void onError(@NonNull Throwable t) {
                                 public void onSelectionChanged() {
                                     super.onSelectionChanged();
                                     if (tracker.hasSelection() && mActionMode == null) {
-                                        mActionMode = startSupportActionMode(new MultiSelectedActionModeCallback(MainActivity.this, coordinatorLayout, binding.activityNotesListView.fabCreate, mainViewModel, MainActivity.this, canMoveNoteToAnotherAccounts, tracker, getSupportFragmentManager()));
+                                        mActionMode = startSupportActionMode(new MultiSelectedActionModeCallback(MainActivity.this,MainActivity.this, coordinatorLayout, binding.activityNotesListView.fabCreate, mainViewModel, MainActivity.this, canMoveNoteToAnotherAccounts, tracker, getSupportFragmentManager()));
                                     }
                                     if (mActionMode != null) {
                                         if (tracker.hasSelection()) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
index 4c192d01e..d47de61ee 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -7,6 +7,8 @@
 package it.niedermann.owncloud.notes.main;
 
 import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -18,7 +20,6 @@
 import androidx.appcompat.view.ActionMode.Callback;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.selection.SelectionTracker;
 
@@ -32,7 +33,7 @@
 import it.niedermann.owncloud.notes.accountpicker.AccountPickerDialogFragment;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.edit.category.CategoryDialogFragment;
-import it.niedermann.owncloud.notes.share.NoteShareFragment;
+import it.niedermann.owncloud.notes.share.NoteShareActivity;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 
 public class MultiSelectedActionModeCallback implements Callback {
@@ -55,8 +56,11 @@ public class MultiSelectedActionModeCallback implements Callback {
     private final SelectionTracker<Long> tracker;
     @NonNull
     private final FragmentManager fragmentManager;
+    @NonNull
+    private final MainActivity mainActivity;
 
     public MultiSelectedActionModeCallback(
+            @NonNull MainActivity mainActivity,
             @NonNull Context context,
             @NonNull View view,
             @NonNull View anchorView,
@@ -65,6 +69,7 @@ public MultiSelectedActionModeCallback(
             boolean canMoveNoteToAnotherAccounts,
             @NonNull SelectionTracker<Long> tracker,
             @NonNull FragmentManager fragmentManager) {
+        this.mainActivity = mainActivity;
         this.context = context;
         this.view = view;
         this.anchorView = anchorView;
@@ -161,11 +166,12 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                     currentAccount$.removeObservers(lifecycleOwner);
                     executor.submit(() -> {{
                         final var note = mainViewModel.getFullNote(selection.get(0));
-                        final var noteShareFragment = NoteShareFragment.newInstance(note, account);
-                        fragmentManager.findFragmentById(R.id.fragment_container_view);
-                        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-                        fragmentTransaction.replace(android.R.id.content, noteShareFragment);
-                        fragmentTransaction.commit();
+                        Bundle bundle = new Bundle();
+                        bundle.putSerializable(NoteShareActivity.ARG_NOTE, note);
+                        bundle.putSerializable(NoteShareActivity.ARG_ACCOUNT, account);
+                        Intent intent = new Intent(mainActivity, NoteShareActivity.class);
+                        intent.putExtras(bundle);
+                        mainActivity.startActivity(intent);
                     }});
                 });
             } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
similarity index 82%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 2302cc089..e52424092 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,7 +14,6 @@
 import android.provider.ContactsContract;
 import android.text.InputType;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -24,10 +23,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.bumptech.glide.Glide;
@@ -45,7 +44,7 @@
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
-import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
+import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -59,87 +58,54 @@
 import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends AppCompatActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
-    private static final String TAG = "NoteShareFragment";
-    private static final String ARG_NOTE = "NOTE";
-    private static final String ARG_ACCOUNT = "ACCOUNT";
-    private static final String ARG_USER = "USER";
+    public static final String ARG_NOTE = "NOTE";
+    public static final String ARG_ACCOUNT = "ACCOUNT";
     public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
-    private FragmentNoteShareBinding binding;
+    private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
 
     private ClientFactoryImpl clientFactory;
 
-    public static NoteShareFragment newInstance(Note note, Account account) {
-        NoteShareFragment fragment = new NoteShareFragment();
-        Bundle args = new Bundle();
-        args.putSerializable(ARG_NOTE, note);
-        args.putSerializable(ARG_ACCOUNT, account);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        clientFactory = new ClientFactoryImpl(requireContext());
-
-        if (savedInstanceState != null) {
-            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
-            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
-        } else {
-            Bundle arguments = getArguments();
-            if (arguments != null) {
-                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
-                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
-            }
-        }
-
-        if (note == null) {
-            throw new IllegalArgumentException("Note cannot be null");
-        }
-
-        if (account == null) {
-            throw new IllegalArgumentException("Account cannot be null");
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        refreshCapabilitiesFromDB();
-        refreshSharesFromDB();
-    }
+        binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
 
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
+        Bundle bundler = getIntent().getExtras();
+        note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
+        account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
 
-        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
+        binding.sharesList.setAdapter(new ShareeListAdapter(this,
                 new ArrayList<>(),
                 this,
                 account));
 
-        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
+        binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
 
         binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
 
         setupView();
 
-        return binding.getRoot();
-    }
+        clientFactory = new ClientFactoryImpl(this);
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
+        if (note == null) {
+            throw new IllegalArgumentException("Note cannot be null");
+        }
+
+        if (account == null) {
+            throw new IllegalArgumentException("Account cannot be null");
+        }
+
+        refreshCapabilitiesFromDB();
+        refreshSharesFromDB();
     }
 
     @Override
@@ -159,7 +125,7 @@ private void setupView() {
 
         // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
 
-        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
+        setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), binding.searchView, getComponentName());
         // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
         binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
@@ -265,9 +231,7 @@ private void setShareWithYou() {
 
     public void copyInternalLink() {
         if (account == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
-                    .setAnchorView(binding.sharesList)
-                    .show();
+            DisplayUtils.showSnackMessage(this, getString(R.string.note_share_fragment_could_not_retrieve_url));
             return;
         }
 
@@ -283,9 +247,9 @@ private void showShareLinkDialog() {
         intentToShareLink.setType("text/plain");
         intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
 
-        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
+        String[] packagesToExclude = new String[] { this.getPackageName() };
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
+        chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
     // TODO: Check account.getUrl returning base url?
@@ -374,14 +338,14 @@ public void copyLink(OCShare share) {
 
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
-        if (getActivity() != null && !getActivity().isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
+        if (!this.isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
         }
     }
 
     @Override
     public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
+        new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
     public void onUpdateShareInformation(RemoteOperationResult result) {
@@ -416,13 +380,13 @@ public void requestPasswordForShareViaLink(boolean createShare, boolean askForPa
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
                 createShare,
                 askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
     @Override
@@ -431,7 +395,7 @@ public void showProfileBottomSheet(User user, String shareWith) {
             new RetrieveHoverCardAsyncTask(user,
                     account,
                     shareWith,
-                    getActivity(),
+                    this,
                     clientFactory).execute();
         }
     }
@@ -492,7 +456,7 @@ public void refreshSharesFromDB() {
     }
 
     private void checkContactPermission() {
-        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
             pickContactEmail();
         } else {
             requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
@@ -502,11 +466,10 @@ private void checkContactPermission() {
     private void pickContactEmail() {
         Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
 
-        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
+        if (intent.resolveActivity(getPackageManager()) != null) {
             onContactSelectionResultLauncher.launch(intent);
         } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
-                    .show();
+            DisplayUtils.showSnackMessage(this, getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
         }
     }
 
@@ -514,7 +477,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
         // Define the projection to get all email addresses.
         String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
 
-        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
+        Cursor cursor = getContentResolver().query(contactUri, projection, null, null, null);
 
         if (cursor != null) {
             if (cursor.moveToFirst()) {
@@ -529,20 +492,17 @@ private void handleContactResult(@NonNull Uri contactUri) {
                         binding.searchView.requestFocus();
                     });
                 } else {
-                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                            .show();
-                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
+                    DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+                    Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address.");
                 }
             } else {
-                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                        .show();
-                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
+                DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+                Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as no Email found.");
             }
             cursor.close();
         } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
-            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+            Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
         }
     }
 
@@ -578,7 +538,7 @@ private boolean isReshareForbidden(OCShare share) {
 
     @VisibleForTesting
     public void search(String query) {
-        SearchView searchView = requireView().findViewById(R.id.searchView);
+        SearchView searchView = findViewById(R.id.searchView);
         searchView.setQuery(query, true);
     }
 
@@ -598,8 +558,7 @@ public void unShare(OCShare share) {
         unshareWith(share);
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
         if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
             return;
         }
         adapter.remove(share);
diff --git a/app/src/main/res/layout/fragment_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_note_share.xml
rename to app/src/main/res/layout/activity_note_share.xml

From 1e12048385af24d3bcda01480a337489c68add1a Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:42:11 +0100
Subject: [PATCH 014/138] use branded activity

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e52424092..112ddc3c5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -43,7 +43,9 @@
 
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
@@ -61,7 +63,7 @@
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends AppCompatActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     public static final String ARG_NOTE = "NOTE";
     public static final String ARG_ACCOUNT = "ACCOUNT";
@@ -70,7 +72,6 @@ public class NoteShareActivity extends AppCompatActivity implements ShareeListAd
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
-
     private ClientFactoryImpl clientFactory;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -79,33 +80,31 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        Bundle bundler = getIntent().getExtras();
-        note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
-        account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
+        initializeArguments();
 
         binding.sharesList.setAdapter(new ShareeListAdapter(this,
                 new ArrayList<>(),
                 this,
                 account));
-
         binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
-
         binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
 
         setupView();
+        refreshCapabilitiesFromDB();
+        refreshSharesFromDB();
+    }
 
+    private void initializeArguments() {
+        Bundle bundler = getIntent().getExtras();
+        note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
+        account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
         clientFactory = new ClientFactoryImpl(this);
-
         if (note == null) {
             throw new IllegalArgumentException("Note cannot be null");
         }
-
         if (account == null) {
             throw new IllegalArgumentException("Account cannot be null");
         }
-
-        refreshCapabilitiesFromDB();
-        refreshSharesFromDB();
     }
 
     @Override
@@ -126,7 +125,6 @@ private void setupView() {
         // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
 
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), binding.searchView, getComponentName());
-        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
         binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
         binding.searchView.setInputType(InputType.TYPE_NULL);
@@ -635,6 +633,13 @@ public void onShareProcessClosed() {
 
     }
 
+    @Override
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, this);
+        util.platform.themeStatusBar(this);
+        util.androidx.themeToolbarSearchView(binding.searchView);
+    }
+
     public interface OnEditShareListener {
         void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
                                boolean isExpiryDateShown);

From 35fa9765bdf842d7f210b4300d9285315146f071 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 12:13:04 +0100
Subject: [PATCH 015/138] add share api

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/ApiProvider.java        |  12 +
 .../notes/persistence/ShareRepository.kt      | 131 ++++++
 .../notes/persistence/sync/ShareAPI.kt        |  41 ++
 .../notes/share/NoteShareActivity.java        |  27 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 433 ++++++++++++++++++
 app/src/main/res/drawable/ic_circles.xml      |  18 +
 app/src/main/res/drawable/ic_group.xml        |  13 +
 app/src/main/res/values/strings.xml           |   6 +
 8 files changed, 671 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
 create mode 100644 app/src/main/res/drawable/ic_circles.xml
 create mode 100644 app/src/main/res/drawable/ic_group.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
index c6268f6f0..f530277b1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
@@ -29,6 +29,7 @@
 import it.niedermann.owncloud.notes.persistence.sync.FilesAPI;
 import it.niedermann.owncloud.notes.persistence.sync.NotesAPI;
 import it.niedermann.owncloud.notes.persistence.sync.OcsAPI;
+import it.niedermann.owncloud.notes.persistence.sync.ShareAPI;
 import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
 import retrofit2.NextcloudRetrofitApiBuilder;
@@ -47,12 +48,14 @@ public class ApiProvider {
 
     private static final String API_ENDPOINT_OCS = "/ocs/v2.php/cloud/";
     private static final String API_ENDPOINT_FILES ="/ocs/v2.php/apps/files/api/v1/";
+    private static final String API_ENDPOINT_FILES_SHARING ="/ocs/v2.php/apps/files_sharing/api/v1/";
 
     private static final Map<String, NextcloudAPI> API_CACHE = new ConcurrentHashMap<>();
 
     private static final Map<String, OcsAPI> API_CACHE_OCS = new ConcurrentHashMap<>();
     private static final Map<String, NotesAPI> API_CACHE_NOTES = new ConcurrentHashMap<>();
     private static final Map<String, FilesAPI> API_CACHE_FILES = new ConcurrentHashMap<>();
+    private static final Map<String, ShareAPI> API_CACHE_FILES_SHARING = new ConcurrentHashMap<>();
 
 
     public static ApiProvider getInstance() {
@@ -96,6 +99,15 @@ public synchronized FilesAPI getFilesAPI(@NonNull Context context, @NonNull Sing
         return filesAPI;
     }
 
+    public synchronized ShareAPI getShareAPI(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount) {
+        if (API_CACHE_FILES_SHARING.containsKey(ssoAccount.name)) {
+            return API_CACHE_FILES_SHARING.get(ssoAccount.name);
+        }
+        final var shareAPI = new NextcloudRetrofitApiBuilder(getNextcloudAPI(context, ssoAccount), API_ENDPOINT_FILES_SHARING).create(ShareAPI.class);
+        API_CACHE_FILES_SHARING.put(ssoAccount.name, shareAPI);
+        return shareAPI;
+    }
+
     private synchronized NextcloudAPI getNextcloudAPI(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount) {
         if (API_CACHE.containsKey(ssoAccount.name)) {
             return API_CACHE.get(ssoAccount.name);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
new file mode 100644
index 000000000..f4bde9516
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
@@ -0,0 +1,131 @@
+package it.niedermann.owncloud.notes.persistence
+
+import android.app.Application
+import android.content.Context
+import com.nextcloud.android.sso.api.EmptyResponse
+import com.nextcloud.android.sso.model.SingleSignOnAccount
+import com.owncloud.android.lib.resources.shares.OCShare
+import com.owncloud.android.lib.resources.shares.ShareType
+import io.reactivex.Single
+import io.reactivex.schedulers.Schedulers
+import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.shared.model.ApiVersion
+
+class ShareRepository private constructor(private val applicationContext: Context) {
+
+    private val apiProvider: ApiProvider by lazy { ApiProvider.getInstance() }
+    private val notesRepository: NotesRepository by lazy {
+        NotesRepository.getInstance(
+            applicationContext,
+        )
+    }
+
+    private fun getNotesPath(account: SingleSignOnAccount): Single<String> {
+        return Single.fromCallable {
+            val call = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
+            val response = call.execute()
+            response.body()?.notesPath ?: throw RuntimeException("No notes path available")
+        }.subscribeOn(Schedulers.io())
+    }
+
+    fun getShares(
+        account: SingleSignOnAccount,
+        remoteId: Long
+    ): Single<List<OCShare>> {
+        return Single.fromCallable {
+            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+            val call = shareAPI.getShares(remoteId)
+            val response = call.execute()
+            response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+        }.subscribeOn(Schedulers.io())
+    }
+
+    fun getSharesForFile(
+        account: SingleSignOnAccount,
+        note: Note,
+        reshares: Boolean = false,
+        subfiles: Boolean = false
+    ): Single<List<OCShare>> {
+        return getNotesPath(account)
+            .flatMap { notesPath ->
+                Single.fromCallable {
+                    val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+                    val call = shareAPI.getSharesForFile(
+                        remoteFilePath = notesPath + "/" + note.remoteId,
+                        reshares = reshares,
+                        subfiles = subfiles
+                    )
+                    val response = call.execute()
+                    response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+                }.subscribeOn(Schedulers.io())
+            }
+    }
+
+    fun deleteShare(
+        account: SingleSignOnAccount,
+        remoteShareId: Long
+    ): Single<EmptyResponse> {
+        return Single.fromCallable {
+            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+            val call = shareAPI.deleteShare(remoteShareId)
+            val response = call.execute()
+            response.body() ?: throw RuntimeException("No shares available")
+        }.subscribeOn(Schedulers.io())
+    }
+
+    fun updateShare(
+        account: SingleSignOnAccount,
+        remoteShareId: Long
+    ): Single<List<OCShare>> {
+        return Single.fromCallable {
+            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+            val call = shareAPI.updateShare(remoteShareId)
+            val response = call.execute()
+            response.body()?.ocs?.data ?: throw RuntimeException("Share update failed")
+        }.subscribeOn(Schedulers.io())
+    }
+
+    fun addShare(
+        account: SingleSignOnAccount,
+        note: Note,
+        shareType: ShareType,
+        shareWith: String,
+        publicUpload: Boolean = false,
+        password: String = "",
+        permissions: Int = 0,
+        getShareDetails: Boolean = true,
+        shareNote: String = ""
+    ): Single<List<OCShare>> {
+        return getNotesPath(account)
+            .flatMap { notesPath ->
+                Single.fromCallable {
+                    val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+                    val call = shareAPI.addShare(
+                        remoteFilePath = notesPath + "/" + note.remoteId,
+                        shareType = shareType,
+                        shareWith = shareWith,
+                        publicUpload = publicUpload,
+                        password = password,
+                        permissions = permissions,
+                        getShareDetails = getShareDetails,
+                        note = shareNote
+                    )
+                    val response = call.execute()
+                    response.body()?.ocs?.data ?: throw RuntimeException("Share creation failed")
+                }.subscribeOn(Schedulers.io())
+            }
+    }
+
+    companion object {
+        private var instance: ShareRepository? = null
+
+        @JvmStatic
+        fun getInstance(applicationContext: Context): ShareRepository {
+            require(applicationContext is Application)
+            if (instance == null) {
+                instance = ShareRepository(applicationContext)
+            }
+            return instance!!
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
new file mode 100644
index 000000000..44e037c6e
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -0,0 +1,41 @@
+package it.niedermann.owncloud.notes.persistence.sync
+
+import com.nextcloud.android.sso.api.EmptyResponse
+import com.owncloud.android.lib.resources.shares.OCShare
+import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.shared.model.OcsResponse
+import retrofit2.Call
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+
+interface ShareAPI {
+    @GET("shares")
+    fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
+
+    @GET("shares")
+    fun getSharesForFile(
+        remoteFilePath: String,
+        reshares: Boolean,
+        subfiles: Boolean
+    ): Call<OcsResponse<MutableList<OCShare>>>
+
+    @DELETE("shares")
+    fun deleteShare(remoteShareId: Long): Call<EmptyResponse>
+
+    @PATCH("shares")
+    fun updateShare(remoteShareId: Long): Call<OcsResponse<List<OCShare>>>
+
+    @POST("shares")
+    fun addShare(
+        remoteFilePath: String,
+        shareType: ShareType,
+        shareWith: String,
+        publicUpload: Boolean,
+        password: String,
+        permissions: Int,
+        getShareDetails: Boolean,
+        note: String
+    ): Call<OcsResponse<List<OCShare>>>
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 112ddc3c5..eafd35dd5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -23,7 +23,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
@@ -54,6 +53,7 @@
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
+import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
@@ -124,12 +124,14 @@ private void setupView() {
 
         // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
 
-        setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), binding.searchView, getComponentName());
+        setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
 
         binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
         binding.searchView.setInputType(InputType.TYPE_NULL);
-        binding.pickContactEmailBtn.setVisibility(View.GONE);
-        disableSearchView(binding.searchView);
+
+        // TODO: When to disable?
+        // binding.pickContactEmailBtn.setVisibility(View.GONE);
+        // disableSearchView(binding.searchView);
 
         /*
         if (file.canReshare()) {
@@ -144,31 +146,36 @@ private void setupView() {
 
     }
 
-    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
+    private void setupSearchView(@Nullable SearchManager searchManager,
                                        ComponentName componentName) {
         if (searchManager == null) {
-            searchView.setVisibility(View.GONE);
+            binding.searchView.setVisibility(View.GONE);
             return;
         }
 
         // assumes parent activity is the searchable activity
-        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
+        binding.searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
 
         // do not iconify the widget; expand it by default
-        searchView.setIconifiedByDefault(false);
+        binding.searchView.setIconifiedByDefault(false);
 
         // avoid fullscreen with softkeyboard
-        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+        binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(account, clientFactory.create());
 
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+        binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
+
                 // return true to prevent the query from being processed;
                 return true;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
+                Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as Cursor is null." + newText);
+
                 // leave it for the parent listener in the hierarchy / default behaviour
                 return false;
             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
new file mode 100644
index 000000000..2bef277d2
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -0,0 +1,433 @@
+package it.niedermann.owncloud.notes.share.helper;
+
+
+import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.provider.BaseColumns;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.users.Status;
+import com.owncloud.android.lib.resources.users.StatusType;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_CLEAR_AT;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_ICON;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_MESSAGE;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_STATUS;
+
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.persistence.ApiProvider;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.shared.model.ApiVersion;
+
+/**
+ * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
+ */
+public class UsersAndGroupsSearchProvider extends ContentProvider {
+
+    private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
+
+    private static final String[] COLUMNS = {
+            BaseColumns._ID,
+            SearchManager.SUGGEST_COLUMN_TEXT_1,
+            SearchManager.SUGGEST_COLUMN_TEXT_2,
+            SearchManager.SUGGEST_COLUMN_ICON_1,
+            SearchManager.SUGGEST_COLUMN_INTENT_DATA
+    };
+
+    private static final int SEARCH = 1;
+
+    private static final int RESULTS_PER_PAGE = 50;
+    private static final int REQUESTED_PAGE = 1;
+
+    public static String ACTION_SHARE_WITH;
+
+    public static final String CONTENT = "content";
+
+    private String AUTHORITY;
+    private String DATA_USER;
+    private String DATA_GROUP;
+    private String DATA_ROOM;
+    private String DATA_REMOTE;
+    private String DATA_EMAIL;
+    private String DATA_CIRCLE;
+
+    private UriMatcher mUriMatcher;
+
+    private OwnCloudClient client;
+    private Account account;
+
+    public UsersAndGroupsSearchProvider(Account account, OwnCloudClient client) {
+        this.account = account;
+        this.client = client;
+    }
+
+    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
+
+    public static ShareType getShareType(String authority) {
+
+        return sShareTypes.get(authority);
+    }
+
+    private static void setActionShareWith(@NonNull Context context) {
+        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        // TODO implement
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        if (getContext() == null) {
+            return false;
+        }
+
+        AUTHORITY = getContext().getString(R.string.users_and_groups_search_authority);
+        setActionShareWith(getContext());
+        DATA_USER = AUTHORITY + ".data.user";
+        DATA_GROUP = AUTHORITY + ".data.group";
+        DATA_ROOM = AUTHORITY + ".data.room";
+        DATA_REMOTE = AUTHORITY + ".data.remote";
+        DATA_EMAIL = AUTHORITY + ".data.email";
+        DATA_CIRCLE = AUTHORITY + ".data.circle";
+
+        sShareTypes.put(DATA_USER, ShareType.USER);
+        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
+        sShareTypes.put(DATA_ROOM, ShareType.ROOM);
+        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
+        sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
+        sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
+
+        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
+
+        return true;
+    }
+
+    /**
+     * returns sharee from server
+     *
+     * Reference: http://developer.android.com/guide/topics/search/adding-custom-suggestions.html#CustomContentProvider
+     *
+     * @param uri           Content {@link Uri}, formatted as "content://com.nextcloud.android.providers.UsersAndGroupsSearchProvider/"
+     *                      + {@link android.app.SearchManager#SUGGEST_URI_PATH_QUERY} + "/" +
+     *                      'userQuery'
+     * @param projection    Expected to be NULL.
+     * @param selection     Expected to be NULL.
+     * @param selectionArgs Expected to be NULL.
+     * @param sortOrder     Expected to be NULL.
+     * @return Cursor with possible sharees in the server that match 'query'.
+     */
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs,
+                        String sortOrder) {
+        Log_OC.d(TAG, "query received in thread " + Thread.currentThread().getName());
+
+        int match = mUriMatcher.match(uri);
+        if (match == SEARCH) {
+            return searchForUsersOrGroups(uri);
+        }
+        return null;
+    }
+
+    private Cursor searchForUsersOrGroups(Uri uri) {
+
+        // TODO check searchConfig and filter results
+        Log.d(TAG, "searchForUsersOrGroups: searchConfig only users: " +  UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers());
+
+        String lastPathSegment = uri.getLastPathSegment();
+
+        if (lastPathSegment == null) {
+            throw new IllegalArgumentException("Wrong URI passed!");
+        }
+
+        String userQuery = lastPathSegment.toLowerCase(Locale.ROOT);
+
+        // ApiProvider.getInstance().getFilesAPI(getContext(), account, ApiVersion.API_VERSION_1_0).getDirectEditingInfo();
+
+
+        // request to the OC server about users and groups matching userQuery
+        GetShareesRemoteOperation searchRequest = new GetShareesRemoteOperation(userQuery,
+                REQUESTED_PAGE,
+                RESULTS_PER_PAGE);
+        RemoteOperationResult<ArrayList<JSONObject>> result = searchRequest.execute(client);
+        List<JSONObject> names = new ArrayList<>();
+
+        if (result.isSuccess()) {
+            names = result.getResultData();
+        } else {
+            showErrorMessage(result);
+        }
+
+        MatrixCursor response = null;
+        // convert the responses from the OC server to the expected format
+        if (names.size() > 0) {
+            if (getContext() == null) {
+                throw new IllegalArgumentException("Context may not be null!");
+            }
+
+            response = new MatrixCursor(COLUMNS);
+
+            Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
+            Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
+            Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
+            Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
+            Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
+            Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
+
+            try {
+                Iterator<JSONObject> namesIt = names.iterator();
+                JSONObject item;
+                String displayName;
+                String subline = null;
+                Object icon = 0;
+                Uri dataUri;
+                int count = 0;
+                while (namesIt.hasNext()) {
+                    item = namesIt.next();
+                    dataUri = null;
+                    displayName = null;
+                    String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
+                    String name = item.isNull("name") ? "" : item.getString("name");
+                    JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
+                    ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
+                    String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
+
+                    Status status;
+                    JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
+
+                    if (statusObject != null) {
+                        status = new Status(
+                                StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
+                                statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
+                                statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
+                                statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
+                    } else {
+                        status = new Status(StatusType.OFFLINE, "", "", -1);
+                    }
+
+                    if ( UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                        // skip all types but users, as E2E secure share is only allowed to users on same server
+                        continue;
+                    }
+
+                    switch (type) {
+                        case GROUP:
+                            displayName = userName;
+                            icon = R.drawable.ic_group;
+                            dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
+                            break;
+
+                        case FEDERATED:
+                            if (true) {
+                                icon = R.drawable.ic_account_circle_grey_24dp;
+                                dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
+
+                                if (userName.equals(shareWith)) {
+                                    displayName = name;
+                                    subline = getContext().getString(R.string.remote);
+                                } else {
+                                    String[] uriSplitted = shareWith.split("@");
+                                    displayName = name;
+                                    subline = getContext().getString(R.string.share_known_remote_on_clarification,
+                                            uriSplitted[uriSplitted.length - 1]);
+                                }
+                            }
+                            break;
+
+                        case USER:
+                            displayName = userName;
+                            subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
+                                    status.getMessage();
+                            Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+
+                            builder.appendQueryParameter("shareWith", shareWith);
+                            builder.appendQueryParameter("displayName", displayName);
+                            builder.appendQueryParameter("status", status.getStatus().toString());
+
+                            if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
+                                builder.appendQueryParameter("icon", status.getIcon());
+                            }
+
+                            icon = builder.build();
+
+                            dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                            break;
+
+                        case EMAIL:
+                            icon = R.drawable.ic_email;
+                            displayName = name;
+                            subline = shareWith;
+                            dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
+                            break;
+
+                        case ROOM:
+                            icon = R.drawable.ic_talk;
+                            displayName = userName;
+                            dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
+                            break;
+
+                        case CIRCLE:
+                            icon = R.drawable.ic_circles;
+                            displayName = userName;
+                            dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
+                            break;
+
+                        default:
+                            break;
+                    }
+
+                    if (displayName != null && dataUri != null) {
+                        response.newRow()
+                                .add(count++)             // BaseColumns._ID
+                                .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
+                                .add(subline)             // SearchManager.SUGGEST_COLUMN_TEXT_2
+                                .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
+                                .add(dataUri);
+                    }
+                }
+
+            } catch (JSONException e) {
+                Log_OC.e(TAG, "Exception while parsing data of users/groups", e);
+            }
+        }
+
+        return response;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Nullable
+    @Override
+    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
+        try {
+            Bitmap avatar = Glide.with(getContext())
+                    .asBitmap()
+                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                    .error(R.drawable.ic_account_circle_grey_24dp)
+                    .apply(RequestOptions.circleCropTransform())
+                    .submit()
+                    .get();
+
+            // create a file to write bitmap data
+            File f = new File(getContext().getCacheDir(), "test");
+            try {
+                if (f.exists()) {
+                    if (!f.delete()) {
+                        throw new IllegalStateException("Existing file could not be deleted!");
+                    }
+                }
+                if (!f.createNewFile()) {
+                    throw new IllegalStateException("File could not be created!");
+                }
+
+                //Convert bitmap to byte array
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+                avatar.compress(Bitmap.CompressFormat.PNG, 90, bos);
+                byte[] bitmapData = bos.toByteArray();
+
+                //write the bytes in file
+                try (FileOutputStream fos = new FileOutputStream(f)) {
+                    fos.write(bitmapData);
+                } catch (FileNotFoundException e) {
+                    Log_OC.e(TAG, "File not found: " + e.getMessage());
+                }
+
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Error opening file: " + e.getMessage());
+            }
+
+            return ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Show error message
+     *
+     * @param result Result with the failure information.
+     */
+    private void showErrorMessage(final RemoteOperationResult result) {
+        Handler handler = new Handler(Looper.getMainLooper());
+        handler.post(() -> {
+            // The Toast must be shown in the main thread to grant that will be hidden correctly; otherwise
+            // the thread may die before, an exception will occur, and the message will be left on the screen
+            // until the app dies
+
+            Context context = getContext();
+
+            if (context == null) {
+                throw new IllegalArgumentException("Context may not be null!");
+            }
+
+            Toast.makeText(getContext().getApplicationContext(),
+                    result.getMessage(),
+                    Toast.LENGTH_SHORT).show();
+        });
+    }
+
+
+}
diff --git a/app/src/main/res/drawable/ic_circles.xml b/app/src/main/res/drawable/ic_circles.xml
new file mode 100644
index 000000000..3f152e7da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circles.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="nonZero"
+        android:pathData="M0.99,17.505L0.99,16.06C0.99,15.402 1.327,14.867 2,14.454C2.672,14.041 3.559,13.835 4.66,13.835C4.859,13.835 5.05,13.839 5.234,13.846C5.417,13.854 5.593,13.873 5.761,13.904C5.548,14.225 5.387,14.562 5.28,14.913C5.172,15.264 5.119,15.631 5.119,16.014L5.119,17.505L0.99,17.505ZM6.495,17.505L6.495,16.014C6.495,15.525 6.629,15.077 6.897,14.673C7.164,14.267 7.543,13.911 8.032,13.606C8.521,13.3 9.106,13.071 9.787,12.917C10.467,12.764 11.205,12.688 12,12.688C12.81,12.688 13.556,12.764 14.237,12.917C14.917,13.071 15.502,13.3 15.991,13.606C16.48,13.911 16.855,14.267 17.115,14.673C17.374,15.077 17.505,15.525 17.505,16.014L17.505,17.505L6.495,17.505ZM18.881,17.505L18.881,16.014C18.881,15.617 18.831,15.241 18.732,14.89C18.632,14.539 18.484,14.209 18.285,13.904C18.452,13.873 18.625,13.854 18.801,13.846C18.976,13.839 19.156,13.835 19.34,13.835C20.441,13.835 21.328,14.038 22,14.443C22.673,14.848 23.01,15.387 23.01,16.06L23.01,17.505L18.881,17.505ZM4.66,12.917C4.156,12.917 3.724,12.738 3.365,12.379C3.005,12.019 2.825,11.587 2.825,11.083C2.825,10.562 3.005,10.127 3.365,9.775C3.724,9.424 4.156,9.248 4.66,9.248C5.181,9.248 5.616,9.424 5.968,9.775C6.319,10.127 6.495,10.562 6.495,11.083C6.495,11.587 6.319,12.019 5.968,12.379C5.616,12.738 5.181,12.917 4.66,12.917ZM19.34,12.917C18.835,12.917 18.403,12.738 18.044,12.379C17.685,12.019 17.505,11.587 17.505,11.083C17.505,10.562 17.685,10.127 18.044,9.775C18.403,9.424 18.835,9.248 19.34,9.248C19.86,9.248 20.296,9.424 20.647,9.775C20.998,10.127 21.175,10.562 21.175,11.083C21.175,11.587 20.998,12.019 20.647,12.379C20.296,12.738 19.86,12.917 19.34,12.917ZM12,12C11.236,12 10.585,11.732 10.05,11.197C9.516,10.662 9.248,10.012 9.248,9.248C9.248,8.468 9.516,7.815 10.05,7.287C10.585,6.759 11.236,6.495 12,6.495C12.78,6.495 13.434,6.759 13.962,7.287C14.489,7.815 14.752,8.468 14.752,9.248C14.752,10.012 14.489,10.662 13.962,11.197C13.434,11.732 12.78,12 12,12Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml
new file mode 100644
index 000000000..aad10ce3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group.xml
@@ -0,0 +1,13 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#757575" android:pathData="M16,13C15.71,13 15.38,13 15.03,13.05C16.19,13.89 17,15 17,16.5V19H23V16.5C23,14.17 18.33,13 16,13M8,13C5.67,13 1,14.17 1,16.5V19H15V16.5C15,14.17 10.33,13 8,13M8,11A3,3 0 0,0 11,8A3,3 0 0,0 8,5A3,3 0 0,0 5,8A3,3 0 0,0 8,11M16,11A3,3 0 0,0 19,8A3,3 0 0,0 16,5A3,3 0 0,0 13,8A3,3 0 0,0 16,11Z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 944bfa5c3..25e07a7a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,11 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+    <string name="document_provider_authority">org.nextcloud.documents</string>
+    <string name="file_provider_authority">org.nextcloud.files</string>
+    <string name="image_cache_provider_authority">org.nextcloud.imageCache.provider</string>
     <string-array name="folder_share_permission_dialog_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_allow_upload_and_editing</item>
@@ -124,6 +129,7 @@
     <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_room_clarification">%1$s (conversation)</string>
     <string name="share_known_remote_on_clarification">on %1$s</string>
+    <string name="remote">(remote)</string>
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>

From c2867eba2eaf5ca07a047530cbc3367d15b12203 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 16:33:36 +0100
Subject: [PATCH 016/138] use share api

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/ShareRepository.kt      |  21 ++
 .../notes/persistence/sync/ShareAPI.kt        |  22 ++
 .../notes/share/NoteShareActivity.java        |  16 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 321 +++---------------
 .../owncloud/notes/share/model/ShareesData.kt |  34 ++
 5 files changed, 124 insertions(+), 290 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
index f4bde9516..afe2a3a49 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
@@ -2,6 +2,7 @@ package it.niedermann.owncloud.notes.persistence
 
 import android.app.Application
 import android.content.Context
+import android.util.Log
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -9,7 +10,10 @@ import com.owncloud.android.lib.resources.shares.ShareType
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.share.model.ShareesData
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
+import org.json.JSONObject
+import java.util.ArrayList
 
 class ShareRepository private constructor(private val applicationContext: Context) {
 
@@ -28,6 +32,23 @@ class ShareRepository private constructor(private val applicationContext: Contex
         }.subscribeOn(Schedulers.io())
     }
 
+    fun getSharees(
+        account: SingleSignOnAccount,
+        searchString: String,
+        page: Int,
+        perPage: Int
+    ): Single<ShareesData> {
+        return Single.fromCallable {
+            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+            val call2 = shareAPI.getSharees2(search = searchString, page = page, perPage = perPage)
+            val response2 = call2.execute()
+
+            val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
+            val response = call.execute()
+            response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+        }.subscribeOn(Schedulers.io())
+    }
+
     fun getShares(
         account: SingleSignOnAccount,
         remoteId: Long
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 44e037c6e..5c35f7131 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -3,14 +3,36 @@ package it.niedermann.owncloud.notes.persistence.sync
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.share.model.ShareesData
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface ShareAPI {
+    @GET("sharees")
+    fun getSharees2(
+        @Query("format") format: String = "json",
+        @Query("itemType") itemType: String = "note",
+        @Query("search") search: String,
+        @Query("page") page: Int,
+        @Query("perPage") perPage: Int,
+        @Query("lookup") lookup: Boolean = true,
+    ): Call<Any>
+
+    @GET("sharees")
+    fun getSharees(
+        @Query("format") format: String = "json",
+        @Query("itemType") itemType: String = "note",
+        @Query("search") search: String,
+        @Query("page") page: Int,
+        @Query("perPage") perPage: Int,
+        @Query("lookup") lookup: Boolean = true,
+    ): Call<OcsResponse<ShareesData>>
+
     @GET("shares")
     fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index eafd35dd5..44d5e7213 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -46,6 +46,7 @@
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
+import it.niedermann.owncloud.notes.persistence.ShareRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -56,6 +57,7 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.ShareesData;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
@@ -146,8 +148,7 @@ private void setupView() {
 
     }
 
-    private void setupSearchView(@Nullable SearchManager searchManager,
-                                       ComponentName componentName) {
+    private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
         if (searchManager == null) {
             binding.searchView.setVisibility(View.GONE);
             return;
@@ -162,8 +163,8 @@ private void setupSearchView(@Nullable SearchManager searchManager,
         // avoid fullscreen with softkeyboard
         binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
 
-        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(account, clientFactory.create());
-
+        ShareRepository repository = ShareRepository.getInstance(getApplicationContext());
+        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, account, repository);
         binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
@@ -174,9 +175,10 @@ public boolean onQueryTextSubmit(String query) {
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as Cursor is null." + newText);
-
-                // leave it for the parent listener in the hierarchy / default behaviour
+                new Thread(() -> {{
+                    ShareesData data = provider.searchForUsersOrGroups(newText);
+                    Log_OC.e(NoteShareActivity.class.getSimpleName(), "Fetched" + newText);
+                }}).start();
                 return false;
             }
         });
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 2bef277d2..f69d4e1f1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -1,28 +1,28 @@
 package it.niedermann.owncloud.notes.share.helper;
 
 
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_CLEAR_AT;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_ICON;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_MESSAGE;
+import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_STATUS;
+
 import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
+
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.nextcloud.android.sso.helper.SingleAccountHelper;
+import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -36,7 +36,6 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -44,25 +43,20 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_CLEAR_AT;
-import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_ICON;
-import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_MESSAGE;
-import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_STATUS;
-
+import io.reactivex.Scheduler;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.persistence.ApiProvider;
+import it.niedermann.owncloud.notes.persistence.ShareRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.model.ShareesData;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 
 /**
  * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
  */
-public class UsersAndGroupsSearchProvider extends ContentProvider {
+public class UsersAndGroupsSearchProvider  {
 
     private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
 
@@ -93,40 +87,17 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     private UriMatcher mUriMatcher;
 
-    private OwnCloudClient client;
+    private ShareRepository repository;
     private Account account;
+    private Context context;
 
-    public UsersAndGroupsSearchProvider(Account account, OwnCloudClient client) {
+    public UsersAndGroupsSearchProvider(Context context, Account account, ShareRepository repository) {
+        this.context = context;
         this.account = account;
-        this.client = client;
-    }
-
-    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
-
-    public static ShareType getShareType(String authority) {
-
-        return sShareTypes.get(authority);
-    }
-
-    private static void setActionShareWith(@NonNull Context context) {
-        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull Uri uri) {
-        // TODO implement
-        return null;
-    }
-
-    @Override
-    public boolean onCreate() {
-        if (getContext() == null) {
-            return false;
-        }
+        this.repository = repository;
 
-        AUTHORITY = getContext().getString(R.string.users_and_groups_search_authority);
-        setActionShareWith(getContext());
+        AUTHORITY = context.getString(R.string.users_and_groups_search_authority);
+        setActionShareWith(context);
         DATA_USER = AUTHORITY + ".data.user";
         DATA_GROUP = AUTHORITY + ".data.group";
         DATA_ROOM = AUTHORITY + ".data.room";
@@ -143,223 +114,33 @@ public boolean onCreate() {
 
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
-
-        return true;
-    }
-
-    /**
-     * returns sharee from server
-     *
-     * Reference: http://developer.android.com/guide/topics/search/adding-custom-suggestions.html#CustomContentProvider
-     *
-     * @param uri           Content {@link Uri}, formatted as "content://com.nextcloud.android.providers.UsersAndGroupsSearchProvider/"
-     *                      + {@link android.app.SearchManager#SUGGEST_URI_PATH_QUERY} + "/" +
-     *                      'userQuery'
-     * @param projection    Expected to be NULL.
-     * @param selection     Expected to be NULL.
-     * @param selectionArgs Expected to be NULL.
-     * @param sortOrder     Expected to be NULL.
-     * @return Cursor with possible sharees in the server that match 'query'.
-     */
-    @Nullable
-    @Override
-    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs,
-                        String sortOrder) {
-        Log_OC.d(TAG, "query received in thread " + Thread.currentThread().getName());
-
-        int match = mUriMatcher.match(uri);
-        if (match == SEARCH) {
-            return searchForUsersOrGroups(uri);
-        }
-        return null;
     }
 
-    private Cursor searchForUsersOrGroups(Uri uri) {
-
-        // TODO check searchConfig and filter results
-        Log.d(TAG, "searchForUsersOrGroups: searchConfig only users: " +  UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers());
-
-        String lastPathSegment = uri.getLastPathSegment();
-
-        if (lastPathSegment == null) {
-            throw new IllegalArgumentException("Wrong URI passed!");
-        }
-
-        String userQuery = lastPathSegment.toLowerCase(Locale.ROOT);
-
-        // ApiProvider.getInstance().getFilesAPI(getContext(), account, ApiVersion.API_VERSION_1_0).getDirectEditingInfo();
-
-
-        // request to the OC server about users and groups matching userQuery
-        GetShareesRemoteOperation searchRequest = new GetShareesRemoteOperation(userQuery,
-                REQUESTED_PAGE,
-                RESULTS_PER_PAGE);
-        RemoteOperationResult<ArrayList<JSONObject>> result = searchRequest.execute(client);
-        List<JSONObject> names = new ArrayList<>();
-
-        if (result.isSuccess()) {
-            names = result.getResultData();
-        } else {
-            showErrorMessage(result);
-        }
-
-        MatrixCursor response = null;
-        // convert the responses from the OC server to the expected format
-        if (names.size() > 0) {
-            if (getContext() == null) {
-                throw new IllegalArgumentException("Context may not be null!");
-            }
-
-            response = new MatrixCursor(COLUMNS);
-
-            Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
-            Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
-            Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
-            Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
-            Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
-            Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
-
-            try {
-                Iterator<JSONObject> namesIt = names.iterator();
-                JSONObject item;
-                String displayName;
-                String subline = null;
-                Object icon = 0;
-                Uri dataUri;
-                int count = 0;
-                while (namesIt.hasNext()) {
-                    item = namesIt.next();
-                    dataUri = null;
-                    displayName = null;
-                    String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
-                    String name = item.isNull("name") ? "" : item.getString("name");
-                    JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
-                    ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
-                    String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
-
-                    Status status;
-                    JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
-
-                    if (statusObject != null) {
-                        status = new Status(
-                                StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
-                                statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
-                                statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
-                                statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
-                    } else {
-                        status = new Status(StatusType.OFFLINE, "", "", -1);
-                    }
-
-                    if ( UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
-                        // skip all types but users, as E2E secure share is only allowed to users on same server
-                        continue;
-                    }
-
-                    switch (type) {
-                        case GROUP:
-                            displayName = userName;
-                            icon = R.drawable.ic_group;
-                            dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
-                            break;
-
-                        case FEDERATED:
-                            if (true) {
-                                icon = R.drawable.ic_account_circle_grey_24dp;
-                                dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
-
-                                if (userName.equals(shareWith)) {
-                                    displayName = name;
-                                    subline = getContext().getString(R.string.remote);
-                                } else {
-                                    String[] uriSplitted = shareWith.split("@");
-                                    displayName = name;
-                                    subline = getContext().getString(R.string.share_known_remote_on_clarification,
-                                            uriSplitted[uriSplitted.length - 1]);
-                                }
-                            }
-                            break;
-
-                        case USER:
-                            displayName = userName;
-                            subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
-                                    status.getMessage();
-                            Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
-
-                            builder.appendQueryParameter("shareWith", shareWith);
-                            builder.appendQueryParameter("displayName", displayName);
-                            builder.appendQueryParameter("status", status.getStatus().toString());
-
-                            if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
-                                builder.appendQueryParameter("icon", status.getIcon());
-                            }
-
-                            icon = builder.build();
-
-                            dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
-                            break;
-
-                        case EMAIL:
-                            icon = R.drawable.ic_email;
-                            displayName = name;
-                            subline = shareWith;
-                            dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
-                            break;
-
-                        case ROOM:
-                            icon = R.drawable.ic_talk;
-                            displayName = userName;
-                            dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
-                            break;
-
-                        case CIRCLE:
-                            icon = R.drawable.ic_circles;
-                            displayName = userName;
-                            dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
-                            break;
-
-                        default:
-                            break;
-                    }
-
-                    if (displayName != null && dataUri != null) {
-                        response.newRow()
-                                .add(count++)             // BaseColumns._ID
-                                .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
-                                .add(subline)             // SearchManager.SUGGEST_COLUMN_TEXT_2
-                                .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
-                                .add(dataUri);
-                    }
-                }
-
-            } catch (JSONException e) {
-                Log_OC.e(TAG, "Exception while parsing data of users/groups", e);
-            }
-        }
+    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
 
-        return response;
+    public static ShareType getShareType(String authority) {
+        return sShareTypes.get(authority);
     }
 
-    @Nullable
-    @Override
-    public Uri insert(@NonNull Uri uri, ContentValues values) {
-        return null;
+    private static void setActionShareWith(@NonNull Context context) {
+        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
     }
 
-    @Override
-    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
-        return 0;
-    }
+    public ShareesData searchForUsersOrGroups(String userQuery) {
+        final SingleSignOnAccount ssoAcc;
+        try {
+            ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
+            return repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE).blockingGet();
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Exception while searching", e);
+        }
 
-    @Override
-    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        return 0;
+        return null;
     }
 
-    @Nullable
-    @Override
     public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
         try {
-            Bitmap avatar = Glide.with(getContext())
+            Bitmap avatar = Glide.with(context)
                     .asBitmap()
                     .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
                     .placeholder(R.drawable.ic_account_circle_grey_24dp)
@@ -369,7 +150,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                     .get();
 
             // create a file to write bitmap data
-            File f = new File(getContext().getCacheDir(), "test");
+            File f = new File(context.getCacheDir(), "test");
             try {
                 if (f.exists()) {
                     if (!f.delete()) {
@@ -404,30 +185,4 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
             throw new RuntimeException(e);
         }
     }
-
-    /**
-     * Show error message
-     *
-     * @param result Result with the failure information.
-     */
-    private void showErrorMessage(final RemoteOperationResult result) {
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> {
-            // The Toast must be shown in the main thread to grant that will be hidden correctly; otherwise
-            // the thread may die before, an exception will occur, and the message will be left on the screen
-            // until the app dies
-
-            Context context = getContext();
-
-            if (context == null) {
-                throw new IllegalArgumentException("Context may not be null!");
-            }
-
-            Toast.makeText(getContext().getApplicationContext(),
-                    result.getMessage(),
-                    Toast.LENGTH_SHORT).show();
-        });
-    }
-
-
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
new file mode 100644
index 000000000..1449c64b5
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
@@ -0,0 +1,34 @@
+package it.niedermann.owncloud.notes.share.model
+
+data class ShareesData(
+    val exact: ExactMatches,
+    val users: List<ShareeItem>,
+    val groups: List<ShareeItem>,
+    val remotes: List<ShareeItem>,
+    val remote_groups: List<ShareeItem>,
+    val emails: List<ShareeItem>,
+    val circles: List<ShareeItem>,
+    val rooms: List<ShareeItem>,
+    val lookup: List<ShareeItem>,
+    val lookupEnabled: Boolean
+)
+
+data class ExactMatches(
+    val users: List<ShareeItem>,
+    val groups: List<ShareeItem>,
+    val remotes: List<ShareeItem>,
+    val remote_groups: List<ShareeItem>,
+    val emails: List<ShareeItem>,
+    val circles: List<ShareeItem>,
+    val rooms: List<ShareeItem>
+)
+
+data class ShareeItem(
+    val label: String,
+    val value: ShareeValue
+)
+
+data class ShareeValue(
+    val shareType: Double,
+    val shareWith: String
+)

From c4b11ef0270eb17e59fee5123fd9dc53b1bfb86d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 10:27:03 +0100
Subject: [PATCH 017/138] fix parsing for sharee

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/ShareRepository.kt      |  70 +++++++++-
 .../notes/persistence/sync/ShareAPI.kt        |   4 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 132 +++++++++++++++++-
 .../owncloud/notes/share/model/ShareesData.kt |  34 +----
 4 files changed, 201 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
index afe2a3a49..bd67cdade 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
@@ -2,18 +2,18 @@ package it.niedermann.owncloud.notes.persistence
 
 import android.app.Application
 import android.content.Context
-import android.util.Log
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.nextcloud.android.sso.model.SingleSignOnAccount
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import it.niedermann.owncloud.notes.persistence.entity.Note
-import it.niedermann.owncloud.notes.share.model.ShareesData
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
+import org.json.JSONArray
 import org.json.JSONObject
-import java.util.ArrayList
 
 class ShareRepository private constructor(private val applicationContext: Context) {
 
@@ -37,15 +37,71 @@ class ShareRepository private constructor(private val applicationContext: Contex
         searchString: String,
         page: Int,
         perPage: Int
-    ): Single<ShareesData> {
+    ): Single<ArrayList<JSONObject>> {
         return Single.fromCallable {
             val shareAPI = apiProvider.getShareAPI(applicationContext, account)
             val call2 = shareAPI.getSharees2(search = searchString, page = page, perPage = perPage)
             val response2 = call2.execute()
 
-            val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
-            val response = call.execute()
-            response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+            val respJSON = JSONObject(response2.body().toString())
+            val respOCS = respJSON.getJSONObject("ocs")
+            val respData = respOCS.getJSONObject("data")
+            val respExact = respData.getJSONObject("exact")
+            val respExactUsers = respExact.getJSONArray("users")
+            val respExactGroups = respExact.getJSONArray("groups")
+            val respExactRemotes = respExact.getJSONArray("remotes")
+            val respExactCircles = if (respExact.has("circles")) {
+                respExact.getJSONArray("circles")
+            } else {
+                JSONArray()
+            }
+            val respExactRooms = if (respExact.has("rooms")) {
+                respExact.getJSONArray("rooms")
+            } else {
+                JSONArray()
+            }
+
+            val respExactEmails = respExact.getJSONArray("emails")
+            val respPartialUsers = respData.getJSONArray("users")
+            val respPartialGroups = respData.getJSONArray("groups")
+            val respPartialRemotes = respData.getJSONArray("remotes")
+            val respPartialCircles = if (respData.has("circles")) {
+                respData.getJSONArray("circles")
+            } else {
+                JSONArray()
+            }
+            val respPartialRooms = if (respData.has("rooms")) {
+                respData.getJSONArray("rooms")
+            } else {
+                JSONArray()
+            }
+
+            val jsonResults = arrayOf(
+                respExactUsers,
+                respExactGroups,
+                respExactRemotes,
+                respExactRooms,
+                respExactEmails,
+                respExactCircles,
+                respPartialUsers,
+                respPartialGroups,
+                respPartialRemotes,
+                respPartialRooms,
+                respPartialCircles
+            )
+            val data: ArrayList<JSONObject> = ArrayList()
+            val var25 = jsonResults
+            val var26 = jsonResults.size
+
+            for (var27 in 0 until var26) {
+                val jsonResult = var25[var27]
+
+                for (j in 0 until jsonResult.length()) {
+                    val jsonObject = jsonResult.getJSONObject(j)
+                    data.add(jsonObject)
+                }
+            }
+            data
         }.subscribeOn(Schedulers.io())
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 5c35f7131..77e37247d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -16,7 +16,7 @@ interface ShareAPI {
     @GET("sharees")
     fun getSharees2(
         @Query("format") format: String = "json",
-        @Query("itemType") itemType: String = "note",
+        @Query("itemType") itemType: String = "file",
         @Query("search") search: String,
         @Query("page") page: Int,
         @Query("perPage") perPage: Int,
@@ -26,7 +26,7 @@ interface ShareAPI {
     @GET("sharees")
     fun getSharees(
         @Query("format") format: String = "json",
-        @Query("itemType") itemType: String = "note",
+        @Query("itemType") itemType: String = "file",
         @Query("search") search: String,
         @Query("page") page: Int,
         @Query("perPage") perPage: Int,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index f69d4e1f1..45c4f0e93 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -130,7 +130,137 @@ public ShareesData searchForUsersOrGroups(String userQuery) {
         final SingleSignOnAccount ssoAcc;
         try {
             ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
-            return repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE).blockingGet();
+            final var names = repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE).blockingGet();
+            ShareesData data = new ShareesData(null,null,null );
+            if (!names.isEmpty()) {
+                MatrixCursor response = new MatrixCursor(COLUMNS);
+
+                Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
+                Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
+                Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
+                Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
+                Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
+                Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
+
+                Iterator<JSONObject> namesIt = names.iterator();
+                JSONObject item;
+                String displayName;
+                String subline = null;
+                Object icon = 0;
+                Uri dataUri;
+                int count = 0;
+                while (namesIt.hasNext()) {
+                    item = namesIt.next();
+                    dataUri = null;
+                    displayName = null;
+                    String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
+                    String name = item.isNull("name") ? "" : item.getString("name");
+                    JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
+                    ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
+                    String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
+
+                    Status status;
+                    JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
+
+                    if (statusObject != null) {
+                        status = new Status(
+                                StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
+                                statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
+                                statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
+                                statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
+                    } else {
+                        status = new Status(StatusType.OFFLINE, "", "", -1);
+                    }
+
+                    if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                        // skip all types but users, as E2E secure share is only allowed to users on same server
+                        // TODO: CHECK SKIP LOGIC
+                       //  continue;
+                    }
+
+                    switch (type) {
+                        case GROUP:
+                            displayName = userName;
+                            icon = R.drawable.ic_group;
+                            dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
+                            break;
+
+                        case FEDERATED:
+                            // TODO: federatedShareAllowed
+                            if (true) {
+                                icon = R.drawable.ic_account_circle_grey_24dp;
+                                dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
+
+                                if (userName.equals(shareWith)) {
+                                    displayName = name;
+                                    subline = context.getString(R.string.remote);
+                                } else {
+                                    String[] uriSplitted = shareWith.split("@");
+                                    displayName = name;
+                                    subline = context.getString(R.string.share_known_remote_on_clarification,
+                                            uriSplitted[uriSplitted.length - 1]);
+                                }
+                            }
+                            break;
+
+                        case USER:
+                            displayName = userName;
+                            subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
+                                    status.getMessage();
+                            Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+
+                            builder.appendQueryParameter("shareWith", shareWith);
+                            builder.appendQueryParameter("displayName", displayName);
+                            builder.appendQueryParameter("status", status.getStatus().toString());
+
+                            if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
+                                builder.appendQueryParameter("icon", status.getIcon());
+                            }
+
+                            icon = builder.build();
+
+                            dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                            break;
+
+                        case EMAIL:
+                            icon = R.drawable.ic_email;
+                            displayName = name;
+                            subline = shareWith;
+                            dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
+                            break;
+
+                        case ROOM:
+                            icon = R.drawable.ic_talk;
+                            displayName = userName;
+                            dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
+                            break;
+
+                        case CIRCLE:
+                            icon = R.drawable.ic_circles;
+                            displayName = userName;
+                            dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
+                            break;
+
+                        default:
+                            break;
+                    }
+
+                    if (displayName != null && dataUri != null) {
+                        response.newRow()
+                                .add(count++)             // BaseColumns._ID
+                                .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
+                                .add(subline)             // SearchManager.SUGGEST_COLUMN_TEXT_2
+                                .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
+                                .add(dataUri);
+                    }
+
+                    data.setDisplayName(displayName);
+                    data.setDataUri(dataUri);
+                    data.setIcon(icon);
+                }
+            }
+
+            return data;
         } catch (Exception e) {
             Log_OC.e(TAG, "Exception while searching", e);
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
index 1449c64b5..0c484527b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
@@ -1,34 +1,10 @@
 package it.niedermann.owncloud.notes.share.model
 
-data class ShareesData(
-    val exact: ExactMatches,
-    val users: List<ShareeItem>,
-    val groups: List<ShareeItem>,
-    val remotes: List<ShareeItem>,
-    val remote_groups: List<ShareeItem>,
-    val emails: List<ShareeItem>,
-    val circles: List<ShareeItem>,
-    val rooms: List<ShareeItem>,
-    val lookup: List<ShareeItem>,
-    val lookupEnabled: Boolean
-)
-
-data class ExactMatches(
-    val users: List<ShareeItem>,
-    val groups: List<ShareeItem>,
-    val remotes: List<ShareeItem>,
-    val remote_groups: List<ShareeItem>,
-    val emails: List<ShareeItem>,
-    val circles: List<ShareeItem>,
-    val rooms: List<ShareeItem>
-)
+import android.net.Uri
 
-data class ShareeItem(
-    val label: String,
-    val value: ShareeValue
+data class ShareesData(
+    var displayName: String?,
+    var dataUri: Uri?,
+    var icon: Any?,
 )
 
-data class ShareeValue(
-    val shareType: Double,
-    val shareWith: String
-)

From 9d8c0651b007c8c745c532315f913bd45ee4a023 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 11:14:35 +0100
Subject: [PATCH 018/138] bind suggestions to UI

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/ShareRepository.kt      |  2 +-
 .../notes/persistence/sync/ShareAPI.kt        | 13 +------
 .../notes/share/NoteShareActivity.java        | 27 +++++++++++--
 .../share/adapter/SuggestionAdapter.java      | 31 +++++++++++++++
 .../helper/UsersAndGroupsSearchProvider.java  | 39 +++++++------------
 .../owncloud/notes/share/model/ShareesData.kt | 10 -----
 6 files changed, 72 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
index bd67cdade..b5e8d6cce 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
@@ -40,7 +40,7 @@ class ShareRepository private constructor(private val applicationContext: Contex
     ): Single<ArrayList<JSONObject>> {
         return Single.fromCallable {
             val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call2 = shareAPI.getSharees2(search = searchString, page = page, perPage = perPage)
+            val call2 = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
             val response2 = call2.execute()
 
             val respJSON = JSONObject(response2.body().toString())
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 77e37247d..ba5cdae15 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -3,7 +3,6 @@ package it.niedermann.owncloud.notes.persistence.sync
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
-import it.niedermann.owncloud.notes.share.model.ShareesData
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
 import retrofit2.http.DELETE
@@ -13,16 +12,6 @@ import retrofit2.http.POST
 import retrofit2.http.Query
 
 interface ShareAPI {
-    @GET("sharees")
-    fun getSharees2(
-        @Query("format") format: String = "json",
-        @Query("itemType") itemType: String = "file",
-        @Query("search") search: String,
-        @Query("page") page: Int,
-        @Query("perPage") perPage: Int,
-        @Query("lookup") lookup: Boolean = true,
-    ): Call<Any>
-
     @GET("sharees")
     fun getSharees(
         @Query("format") format: String = "json",
@@ -31,7 +20,7 @@ interface ShareAPI {
         @Query("page") page: Int,
         @Query("perPage") perPage: Int,
         @Query("lookup") lookup: Boolean = true,
-    ): Call<OcsResponse<ShareesData>>
+    ): Call<Any>
 
     @GET("shares")
     fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 44d5e7213..10dc8fe99 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -50,6 +50,7 @@
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
 import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
@@ -57,7 +58,6 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.ShareesData;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
@@ -154,6 +154,9 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
+        binding.searchView.setSuggestionsAdapter(suggestionAdapter);
+
         // assumes parent activity is the searchable activity
         binding.searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
 
@@ -176,12 +179,30 @@ public boolean onQueryTextSubmit(String query) {
             @Override
             public boolean onQueryTextChange(String newText) {
                 new Thread(() -> {{
-                    ShareesData data = provider.searchForUsersOrGroups(newText);
-                    Log_OC.e(NoteShareActivity.class.getSimpleName(), "Fetched" + newText);
+                    try (Cursor cursor = provider.searchForUsersOrGroups(newText)) {
+                        runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
+                    }
                 }}).start();
                 return false;
             }
         });
+
+        binding.searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+            @Override
+            public boolean onSuggestionSelect(int position) {
+                return false;
+            }
+
+            @Override
+            public boolean onSuggestionClick(int position) {
+                Cursor cursor = suggestionAdapter.getCursor();
+                if (cursor.moveToPosition(position)) {
+                    String suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1));
+                    binding.searchView.setQuery(suggestion, false);
+                }
+                return true;
+            }
+        });
     }
 
     private void disableSearchView(View view) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java
new file mode 100644
index 000000000..578550350
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java
@@ -0,0 +1,31 @@
+package it.niedermann.owncloud.notes.share.adapter;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.database.Cursor;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.cursoradapter.widget.CursorAdapter;
+
+public class SuggestionAdapter extends CursorAdapter {
+
+    public SuggestionAdapter(Context context, Cursor cursor) {
+        super(context, cursor, false);
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        return inflater.inflate(android.R.layout.simple_list_item_1, parent, false);
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        TextView textView = view.findViewById(android.R.id.text1);
+        String suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1));
+        textView.setText(suggestion);
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 45c4f0e93..ab779bd61 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -29,7 +29,6 @@
 import com.owncloud.android.lib.resources.users.Status;
 import com.owncloud.android.lib.resources.users.StatusType;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.ByteArrayOutputStream;
@@ -38,19 +37,14 @@
 import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.persistence.ShareRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
-import it.niedermann.owncloud.notes.share.model.ShareesData;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 
 /**
@@ -77,19 +71,19 @@ public class UsersAndGroupsSearchProvider  {
 
     public static final String CONTENT = "content";
 
-    private String AUTHORITY;
-    private String DATA_USER;
-    private String DATA_GROUP;
-    private String DATA_ROOM;
-    private String DATA_REMOTE;
-    private String DATA_EMAIL;
-    private String DATA_CIRCLE;
+    private final String AUTHORITY;
+    private final String DATA_USER;
+    private final String DATA_GROUP;
+    private final String DATA_ROOM;
+    private final String DATA_REMOTE;
+    private final String DATA_EMAIL;
+    private final String DATA_CIRCLE;
 
-    private UriMatcher mUriMatcher;
+    private final UriMatcher mUriMatcher;
 
-    private ShareRepository repository;
-    private Account account;
-    private Context context;
+    private final ShareRepository repository;
+    private final Account account;
+    private final Context context;
 
     public UsersAndGroupsSearchProvider(Context context, Account account, ShareRepository repository) {
         this.context = context;
@@ -126,14 +120,14 @@ private static void setActionShareWith(@NonNull Context context) {
         ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
     }
 
-    public ShareesData searchForUsersOrGroups(String userQuery) {
+    public Cursor searchForUsersOrGroups(String userQuery) {
         final SingleSignOnAccount ssoAcc;
         try {
             ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
             final var names = repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE).blockingGet();
-            ShareesData data = new ShareesData(null,null,null );
+            MatrixCursor response = null;
             if (!names.isEmpty()) {
-                MatrixCursor response = new MatrixCursor(COLUMNS);
+                response = new MatrixCursor(COLUMNS);
 
                 Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
                 Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
@@ -254,13 +248,10 @@ public ShareesData searchForUsersOrGroups(String userQuery) {
                                 .add(dataUri);
                     }
 
-                    data.setDisplayName(displayName);
-                    data.setDataUri(dataUri);
-                    data.setIcon(icon);
                 }
             }
 
-            return data;
+            return response;
         } catch (Exception e) {
             Log_OC.e(TAG, "Exception while searching", e);
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
deleted file mode 100644
index 0c484527b..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/ShareesData.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package it.niedermann.owncloud.notes.share.model
-
-import android.net.Uri
-
-data class ShareesData(
-    var displayName: String?,
-    var dataUri: Uri?,
-    var icon: Any?,
-)
-

From e157d866794c175d2e771ec6b2d58fc584a9fc17 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 11:18:08 +0100
Subject: [PATCH 019/138] bind suggestions to UI

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 10dc8fe99..12bfddc4c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -67,6 +67,7 @@
 
 public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
+    private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
     public static final String ARG_ACCOUNT = "ACCOUNT";
     public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
@@ -180,6 +181,11 @@ public boolean onQueryTextSubmit(String query) {
             public boolean onQueryTextChange(String newText) {
                 new Thread(() -> {{
                     try (Cursor cursor = provider.searchForUsersOrGroups(newText)) {
+                        if (cursor == null) {
+                            Log_OC.d(TAG,"searchForUsersOrGroups returned null");
+                            return;
+                        }
+
                         runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
                     }
                 }}).start();

From 484677b1e6d9aec85c319316850f0ac395496e37 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 11:26:59 +0100
Subject: [PATCH 020/138] add to-do

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        | 19 +++++++++++--------
 .../notes/share/NoteShareActivity.java        |  4 +++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index ba5cdae15..124c914f3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -6,6 +6,8 @@ import com.owncloud.android.lib.resources.shares.ShareType
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
 import retrofit2.http.DELETE
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
@@ -38,15 +40,16 @@ interface ShareAPI {
     @PATCH("shares")
     fun updateShare(remoteShareId: Long): Call<OcsResponse<List<OCShare>>>
 
+    @FormUrlEncoded
     @POST("shares")
     fun addShare(
-        remoteFilePath: String,
-        shareType: ShareType,
-        shareWith: String,
-        publicUpload: Boolean,
-        password: String,
-        permissions: Int,
-        getShareDetails: Boolean,
-        note: String
+        @Field("remoteFilePath") remoteFilePath: String,
+        @Field("shareType") shareType: ShareType,
+        @Field("shareWith") shareWith: String,
+        @Field("publicUpload") publicUpload: Boolean,
+        @Field("password") password: String,
+        @Field("permissions") permissions: Int,
+        @Field("getShareDetails") getShareDetails: Boolean,
+        @Field("note") note: String
     ): Call<OcsResponse<List<OCShare>>>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 12bfddc4c..ae7c0b2d7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -202,9 +202,11 @@ public boolean onSuggestionSelect(int position) {
             @Override
             public boolean onSuggestionClick(int position) {
                 Cursor cursor = suggestionAdapter.getCursor();
-                if (cursor.moveToPosition(position)) {
+                if (cursor != null && cursor.moveToPosition(position)) {
                     String suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1));
                     binding.searchView.setQuery(suggestion, false);
+
+                    // TODO: Navigate to details
                 }
                 return true;
             }

From af49ff38260156fbfa534bce91e52b9cb4be0746 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 12:59:36 +0100
Subject: [PATCH 021/138] Rename .java to .kt

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../adapter/{SuggestionAdapter.java => SuggestionAdapter.kt}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/java/it/niedermann/owncloud/notes/share/adapter/{SuggestionAdapter.java => SuggestionAdapter.kt} (100%)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
similarity index 100%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt

From b2c7f9f6620d3ffc0d839f4ac68c69c104207ae8 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 12:59:37 +0100
Subject: [PATCH 022/138] add icon for suggestion

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/adapter/SuggestionAdapter.kt  | 56 +++++++++++--------
 .../helper/UsersAndGroupsSearchProvider.java  |  2 +-
 .../res/layout/item_suggestion_adapter.xml    | 22 ++++++++
 3 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/layout/item_suggestion_adapter.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
index 578550350..ac3cc44fb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
@@ -1,31 +1,39 @@
-package it.niedermann.owncloud.notes.share.adapter;
+package it.niedermann.owncloud.notes.share.adapter
 
-import android.app.SearchManager;
-import android.content.Context;
-import android.database.Cursor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
+import android.app.SearchManager
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.database.getIntOrNull
+import androidx.core.database.getStringOrNull
+import androidx.cursoradapter.widget.CursorAdapter
+import it.niedermann.owncloud.notes.R
 
-import androidx.cursoradapter.widget.CursorAdapter;
-
-public class SuggestionAdapter extends CursorAdapter {
-
-    public SuggestionAdapter(Context context, Cursor cursor) {
-        super(context, cursor, false);
+class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(context, cursor, false) {
+    override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
+        val inflater = LayoutInflater.from(context)
+        return inflater.inflate(R.layout.item_suggestion_adapter, parent, false)
     }
 
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        return inflater.inflate(android.R.layout.simple_list_item_1, parent, false);
-    }
+    override fun bindView(view: View, context: Context, cursor: Cursor) {
+        val suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
+        view.findViewById<TextView>(R.id.suggestion_text).text = suggestion
+
+        val icon = view.findViewById<ImageView>(R.id.suggestion_icon)
 
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        TextView textView = view.findViewById(android.R.id.text1);
-        String suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1));
-        textView.setText(suggestion);
+        val iconId = cursor.getIntOrNull(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1))
+        if (iconId != null) {
+            icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
+        } else {
+            val iconURIAsString = cursor.getStringOrNull(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1)) ?: return
+            val iconURI = Uri.parse(iconURIAsString)
+            icon.setImageURI(iconURI)
+        }
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index ab779bd61..973bdde7d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -211,7 +211,7 @@ public Cursor searchForUsersOrGroups(String userQuery) {
                                 builder.appendQueryParameter("icon", status.getIcon());
                             }
 
-                            icon = builder.build();
+                            icon = builder.build().toString();
 
                             dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
                             break;
diff --git a/app/src/main/res/layout/item_suggestion_adapter.xml b/app/src/main/res/layout/item_suggestion_adapter.xml
new file mode 100644
index 000000000..b00e8d5eb
--- /dev/null
+++ b/app/src/main/res/layout/item_suggestion_adapter.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <ImageView
+        android:id="@+id/suggestion_icon"
+        android:layout_width="@dimen/default_icon_size"
+        android:layout_height="@dimen/default_icon_size"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="@string/note_share_fragment_icon_content_description" />
+
+    <TextView
+        android:id="@+id/suggestion_text"
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/default_icon_size"
+        android:textSize="@dimen/note_font_size_small" />
+
+</LinearLayout>

From 092ebd2941b340dedb08b19118031e088d7d5d4d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 13:01:46 +0100
Subject: [PATCH 023/138] add READ_CONTACTS permission

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3db3e24f7..90468a0b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <queries>
         <package android:name="com.nextcloud.client" />

From d52e1bd1f6e1d2740510d6d512b13df62ae154c0 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 13:18:13 +0100
Subject: [PATCH 024/138] fix share internal link

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |  6 +++
 .../notes/share/NoteShareActivity.java        | 41 ++++++++-----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90468a0b9..d14dc616b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,6 +55,12 @@
             android:name=".importaccount.ImportAccountActivity"
             android:label="@string/add_account" />
 
+        <activity
+            android:name=".shared.util.clipboard.CopyToClipboardActivity"
+            android:exported="false"
+            android:icon="@drawable/shared_via_link"
+            android:label="@string/copy_link" />
+
         <activity
             android:name=".AppendToNoteActivity"
             android:label="@string/append_to_note"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ae7c0b2d7..599544848 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -82,13 +82,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
         binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-
         initializeArguments();
 
-        binding.sharesList.setAdapter(new ShareeListAdapter(this,
-                new ArrayList<>(),
-                this,
-                account));
+        binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
         binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
         binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
 
@@ -124,13 +120,9 @@ public void onStop() {
 
     private void setupView() {
         setShareWithYou();
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
 
-        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-        binding.searchView.setInputType(InputType.TYPE_NULL);
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
 
         // TODO: When to disable?
         // binding.pickContactEmailBtn.setVisibility(View.GONE);
@@ -146,7 +138,6 @@ private void setupView() {
             disableSearchView(binding.searchView);
         }
          */
-
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -211,6 +202,9 @@ public boolean onSuggestionClick(int position) {
                 return true;
             }
         });
+
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
     }
 
     private void disableSearchView(View view) {
@@ -242,14 +236,7 @@ private void setShareWithYou() {
              */
 
 
-            Glide.with(this)
-                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                    .error(R.drawable.ic_account_circle_grey_24dp)
-                    .apply(RequestOptions.circleCropTransform())
-                    .into(binding.sharedWithYouAvatar);
-
-            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+            loadAvatar();
 
             /*
             // TODO: Note's note?
@@ -265,6 +252,17 @@ private void setShareWithYou() {
         }
     }
 
+    private void loadAvatar() {
+        Glide.with(this)
+                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                .error(R.drawable.ic_account_circle_grey_24dp)
+                .apply(RequestOptions.circleCropTransform())
+                .into(binding.sharedWithYouAvatar);
+
+        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+    }
+
     public void copyInternalLink() {
         if (account == null) {
             DisplayUtils.showSnackMessage(this, getString(R.string.note_share_fragment_could_not_retrieve_url));
@@ -288,10 +286,9 @@ private void showShareLinkDialog() {
         chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
-    // TODO: Check account.getUrl returning base url?
     private String createInternalLink() {
         Uri baseUri = Uri.parse(account.getUrl());
-        return baseUri + "/index.php/f/" +  note.getId();
+        return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
     // TODO: Capabilities in notes app doesn't have following functions...
@@ -356,7 +353,6 @@ private void showSendLinkTo(OCShare publicShare) {
             }
         }
          */
-
     }
 
     public void copyLink(OCShare share) {
@@ -369,7 +365,6 @@ public void copyLink(OCShare share) {
             }
         }
          */
-
     }
 
     @Override

From 6224f499573f93b5da9ca06ec8294192a5b291c1 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 13:23:54 +0100
Subject: [PATCH 025/138] hide shared_with_you_container

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java   | 1 -
 app/src/main/res/layout/activity_note_share.xml                 | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 599544848..a9c4e0373 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -314,7 +314,6 @@ public void createPublicShareLink() {
             mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
          */
-
     }
 
     public void createSecureFileDrop() {
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 4ce2f8cdb..358985686 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -54,8 +54,10 @@
 
     </LinearLayout>
 
+    <!-- // TODO: Implement later ... -->
     <LinearLayout
         android:id="@+id/shared_with_you_container"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacer_1x"

From 2d00a241e532aed3b7154c58878af06dde8c55ee Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 14:45:10 +0100
Subject: [PATCH 026/138] add previous functionality

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../main/MultiSelectedActionModeCallback.java | 19 -------------------
 .../notes/share/NoteShareActivity.java        |  2 ++
 .../main/res/layout/activity_note_share.xml   | 15 +++++++++++++++
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
index d47de61ee..929ad1319 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -180,25 +180,6 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                         mainViewModel.collectNoteContents(selection));
             }
 
-            /*
-             final var selection = new ArrayList<Long>(tracker.getSelection().size());
-            for (final var sel : tracker.getSelection()) {
-                selection.add(sel);
-            }
-            tracker.clearSelection();
-
-            executor.submit(() -> {
-                if (selection.size() == 1) {
-                    final var note = mainViewModel.getFullNote(selection.get(0));
-                    ShareUtil.openShareDialog(context, note.getTitle(), note.getContent());
-                } else {
-                    ShareUtil.openShareDialog(context,
-                            context.getResources().getQuantityString(R.plurals.share_multiple, selection.size(), selection.size()),
-                            mainViewModel.collectNoteContents(selection));
-                }
-            });
-             */
-
             return true;
         } else if (itemId == R.id.menu_category) {// TODO detect whether all selected notes do have the same category - in this case preselect it
             final var accountLiveData = mainViewModel.getCurrentAccount();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index a9c4e0373..75dbfdc68 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -63,6 +63,7 @@
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
+import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
 public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
@@ -87,6 +88,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
         binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
         binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+        binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
 
         setupView();
         refreshCapabilitiesFromDB();
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 358985686..1acfb8396 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -15,6 +15,21 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/spacer_1hx">
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnShareButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.MaterialComponents.Button.Icon"
+        android:paddingStart="@dimen/spacer_3x"
+        android:paddingEnd="@dimen/zero"
+        android:text="@string/note_share_fragment_share_note"
+        android:textAlignment="textStart"
+        android:textColor="@color/text_color"
+        app:iconPadding="@dimen/share_button_padding"
+        app:iconTint="@color/text_color"
+        app:icon="@drawable/ic_share_white_24dp"
+        app:iconGravity="start" />
+
     <LinearLayout
         android:id="@+id/search_container"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8c3cfa347..856d60fde 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,6 +28,7 @@
     <dimen name="bottom_sheet_text_size">16sp</dimen>
     <dimen name="bottom_sheet_item_height">56dp</dimen>
     <dimen name="dialog_padding">24dp</dimen>
+    <dimen name="share_button_padding">28dp</dimen>
 
     <dimen name="spacer_activity_sides">0dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25e07a7a9..b909db466 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,6 +61,7 @@
     <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
     <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
     <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_fragment_share_note">Share note</string>
     <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
     <string name="note_share_fragment_share_link">Share link</string>
     <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>

From 1c83a3d9bde58c76d1cf633e4d03c72fd27a30ff Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 16:08:08 +0100
Subject: [PATCH 027/138] add NoteShareDetailActivity

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |   3 +
 .../notes/share/NoteShareActivity.java        |  18 +-
 .../notes/share/NoteShareDetailActivity.kt    | 560 ++++++++++++++++++
 .../ExpirationDatePickerDialogFragment.kt     | 167 ++++++
 .../helper/UsersAndGroupsSearchProvider.java  |  11 +-
 app/src/main/res/drawable/file_calendar.xml   |  16 +
 .../res/layout/activity_note_share_detail.xml | 256 ++++++++
 app/src/main/res/values-night/colors.xml      |   2 +
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/dimens.xml            |   4 +
 app/src/main/res/values/strings.xml           |  17 +
 app/src/main/res/values/styles.xml            |  15 +
 12 files changed, 1069 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ExpirationDatePickerDialogFragment.kt
 create mode 100644 app/src/main/res/drawable/file_calendar.xml
 create mode 100644 app/src/main/res/layout/activity_note_share_detail.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d14dc616b..3940a1917 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,9 @@
         <activity
             android:name=".share.NoteShareActivity" />
 
+        <activity
+            android:name=".share.NoteShareDetailActivity" />
+
         <activity
             android:name=".importaccount.ImportAccountActivity"
             android:label="@string/add_account" />
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 75dbfdc68..fae3de4cf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -180,6 +180,8 @@ public boolean onQueryTextChange(String newText) {
                         }
 
                         runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
+                    } catch (Exception e) {
+                        Log_OC.d(TAG,"Exception setupSearchView.onQueryTextChange: " + e);
                     }
                 }}).start();
                 return false;
@@ -199,7 +201,9 @@ public boolean onSuggestionClick(int position) {
                     String suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1));
                     binding.searchView.setQuery(suggestion, false);
 
-                    // TODO: Navigate to details
+                    String shareWith = cursor.getString(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_WITH));
+                    int shareType = cursor.getInt(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_TYPE));
+                    navigateNoteShareDetail(shareWith, shareType);
                 }
                 return true;
             }
@@ -209,6 +213,18 @@ public boolean onSuggestionClick(int position) {
         binding.searchView.setInputType(InputType.TYPE_NULL);
     }
 
+    private void navigateNoteShareDetail(String shareWith, int shareType) {
+        Bundle bundle = new Bundle();
+
+        bundle.putSerializable(NoteShareDetailActivity.ARG_NOTE, note);
+        bundle.putString(NoteShareDetailActivity.ARG_SHAREE_NAME, shareWith);
+        bundle.putInt(NoteShareDetailActivity.ARG_SHARE_TYPE, shareType);
+
+        Intent intent = new Intent(this, NoteShareDetailActivity.class);
+        intent.putExtras(bundle);
+        startActivity(intent);
+    }
+
     private void disableSearchView(View view) {
         view.setEnabled(false);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
new file mode 100644
index 000000000..7194274a6
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -0,0 +1,560 @@
+package it.niedermann.owncloud.notes.share
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.View
+import com.owncloud.android.lib.resources.shares.OCShare
+import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
+import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandedActivity
+import it.niedermann.owncloud.notes.branding.BrandingUtil
+import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
+import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
+import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
+import it.niedermann.owncloud.notes.shared.util.DisplayUtils
+import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
+import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
+import java.text.SimpleDateFormat
+import java.util.Date
+
+/**
+ * Activity class to show share permission options, set expiration date, change label, set password, send note
+ *
+ * This activity handles following:
+ * 1. This will be shown while creating new internal and external share. So that user can set every share
+ * configuration at one time.
+ * 2. This will handle both Advanced Permissions and Send New Email functionality for existing shares to modify them.
+ */
+@Suppress("TooManyFunctions")
+class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFragment.OnExpiryDateListener {
+
+    companion object {
+        const val TAG = "NoteShareDetailActivity"
+        const val ARG_NOTE = "arg_sharing_note"
+        const val ARG_SHAREE_NAME = "arg_sharee_name"
+        const val ARG_SHARE_TYPE = "arg_share_type"
+        const val ARG_OCSHARE = "arg_ocshare"
+        const val ARG_SCREEN_TYPE = "arg_screen_type"
+        const val ARG_RESHARE_SHOWN = "arg_reshare_shown"
+        const val ARG_EXP_DATE_SHOWN = "arg_exp_date_shown"
+        private const val ARG_SECURE_SHARE = "secure_share"
+
+        // types of screens to be displayed
+        const val SCREEN_TYPE_PERMISSION = 1 // permissions screen
+        const val SCREEN_TYPE_NOTE = 2 // note screen
+
+        /*
+         /**
+         * fragment instance to be called while creating new share for internal and external share
+         */
+        @JvmStatic
+        fun newInstance(
+            file: OCFile,
+            shareeName: String,
+            shareType: ShareType,
+            secureShare: Boolean
+        ): FileDetailsSharingProcessFragment {
+            val args = Bundle()
+            args.putParcelable(ARG_OCFILE, file)
+            args.putSerializable(ARG_SHARE_TYPE, shareType)
+            args.putString(ARG_SHAREE_NAME, shareeName)
+            args.putBoolean(ARG_SECURE_SHARE, secureShare)
+            val fragment = FileDetailsSharingProcessFragment()
+            fragment.arguments = args
+            return fragment
+        }
+
+        /**
+         * fragment instance to be called while modifying existing share information
+         */
+        @JvmStatic
+        fun newInstance(
+            share: OCShare,
+            screenType: Int,
+            isReshareShown: Boolean,
+            isExpirationDateShown: Boolean
+        ): FileDetailsSharingProcessFragment {
+            val args = Bundle()
+            args.putParcelable(ARG_OCSHARE, share)
+            args.putInt(ARG_SCREEN_TYPE, screenType)
+            args.putBoolean(ARG_RESHARE_SHOWN, isReshareShown)
+            args.putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown)
+            val fragment = FileDetailsSharingProcessFragment()
+            fragment.arguments = args
+            return fragment
+        }
+         */
+
+    }
+
+    private lateinit var binding: ActivityNoteShareDetailBinding
+    private var file: Note? = null // file to be share
+    private var shareeName: String? = null
+    private lateinit var shareType: ShareType
+    private var shareProcessStep = SCREEN_TYPE_PERMISSION // default screen type
+    private var permission = OCShare.NO_PERMISSION // no permission
+    private var chosenExpDateInMills: Long = -1 // for no expiry date
+
+    private var share: OCShare? = null
+    private var isReShareShown: Boolean = true // show or hide reShare option
+    private var isExpDateShown: Boolean = true // show or hide expiry date option
+    private var isSecureShare: Boolean = false
+
+    private var expirationDatePickerFragment: ExpirationDatePickerDialogFragment? = null
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityNoteShareDetailBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        val arguments = intent.extras
+
+        arguments?.let {
+            file = it.getSerializableArgument(ARG_NOTE, Note::class.java)
+            shareeName = it.getString(ARG_SHAREE_NAME)
+            share = it.getParcelableArgument(ARG_OCSHARE, OCShare::class.java)
+
+            if (it.containsKey(ARG_SHARE_TYPE)) {
+                shareType = ShareType.fromValue(it.getInt(ARG_SHARE_TYPE))
+            } else if (share != null) {
+                shareType = share!!.shareType!!
+            }
+
+            shareProcessStep = it.getInt(ARG_SCREEN_TYPE, SCREEN_TYPE_PERMISSION)
+            isReShareShown = it.getBoolean(ARG_RESHARE_SHOWN, true)
+            isExpDateShown = it.getBoolean(ARG_EXP_DATE_SHOWN, true)
+            isSecureShare = it.getBoolean(ARG_SECURE_SHARE, false)
+        }
+
+        // capabilities = CapabilityUtils.getCapability(context)
+
+        if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
+            showShareProcessFirst()
+        } else {
+            showShareProcessSecond()
+        }
+        implementClickEvents()
+    }
+
+
+    override fun applyBrand(color: Int) {
+        val util = BrandingUtil.of(color, this)
+
+        util.platform.themeRadioButton(binding.shareProcessPermissionReadOnly)
+        util.platform.themeRadioButton(binding.shareProcessPermissionUploadEditing)
+        util.platform.themeRadioButton(binding.shareProcessPermissionFileDrop)
+
+        util.platform.colorTextView(binding.shareProcessEditShareLink)
+        util.platform.colorTextView(binding.shareProcessAdvancePermissionTitle)
+
+        util.platform.themeCheckbox(binding.shareProcessAllowResharingCheckbox)
+
+
+        util.androidx.colorSwitchCompat(binding.shareProcessSetPasswordSwitch)
+        util.androidx.colorSwitchCompat(binding.shareProcessSetExpDateSwitch)
+        util.androidx.colorSwitchCompat(binding.shareProcessHideDownloadCheckbox)
+        util.androidx.colorSwitchCompat(binding.shareProcessChangeNameSwitch)
+
+        util.material.colorTextInputLayout(binding.shareProcessEnterPasswordContainer)
+        util.material.colorTextInputLayout(binding.shareProcessChangeNameContainer)
+        util.material.colorTextInputLayout(binding.noteContainer)
+
+        util.material.colorMaterialButtonPrimaryFilled(binding.shareProcessBtnNext)
+        util.material.colorMaterialButtonPrimaryOutlined(binding.shareProcessBtnCancel)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        // Force recreation of dialog activity when screen rotates
+        // This is needed because the calendar layout should be different in portrait and landscape,
+        // but as FDA persists through config changes, the dialog is not recreated automatically
+        val datePicker = expirationDatePickerFragment
+        if (datePicker?.dialog?.isShowing == true) {
+            val currentSelectionMillis = datePicker.currentSelectionMillis
+            datePicker.dismiss()
+            showExpirationDateDialog(currentSelectionMillis)
+        }
+    }
+
+    private fun showShareProcessFirst() {
+        binding.shareProcessGroupOne.visibility = View.VISIBLE
+        binding.shareProcessEditShareLink.visibility = View.VISIBLE
+        binding.shareProcessGroupTwo.visibility = View.GONE
+
+        if (share != null) {
+            setupModificationUI()
+        } else {
+            setupUpdateUI()
+        }
+
+        if (isSecureShare) {
+            binding.shareProcessAdvancePermissionTitle.visibility = View.GONE
+        }
+
+        // show or hide expiry date
+        if (isExpDateShown && !isSecureShare) {
+            binding.shareProcessSetExpDateSwitch.visibility = View.VISIBLE
+        } else {
+            binding.shareProcessSetExpDateSwitch.visibility = View.GONE
+        }
+        shareProcessStep = SCREEN_TYPE_PERMISSION
+    }
+
+    private fun setupModificationUI() {
+        if (share?.isFolder == true) updateViewForFolder() else updateViewForFile()
+
+        // read only / allow upload and editing / file drop
+        if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
+            binding.shareProcessPermissionUploadEditing.isChecked = true
+        } else if (SharingMenuHelper.isFileDrop(share) && share?.isFolder == true) {
+            binding.shareProcessPermissionFileDrop.isChecked = true
+        } else if (SharingMenuHelper.isReadOnly(share)) {
+            binding.shareProcessPermissionReadOnly.isChecked = true
+        }
+
+        shareType = share?.shareType ?: ShareType.NO_SHARED
+
+        // show different text for link share and other shares
+        // because we have link to share in Public Link
+        binding.shareProcessBtnNext.text = getString(
+            if (shareType == ShareType.PUBLIC_LINK) {
+                R.string.share_copy_link
+            } else {
+                R.string.common_confirm
+            }
+        )
+
+        updateViewForShareType()
+        binding.shareProcessSetPasswordSwitch.isChecked = share?.isPasswordProtected == true
+        showPasswordInput(binding.shareProcessSetPasswordSwitch.isChecked)
+        updateExpirationDateView()
+        showExpirationDateInput(binding.shareProcessSetExpDateSwitch.isChecked)
+    }
+
+    private fun setupUpdateUI() {
+        binding.shareProcessBtnNext.text = getString(R.string.common_next)
+        file.let {
+            updateViewForFile()
+            updateViewForShareType()
+        }
+        showPasswordInput(binding.shareProcessSetPasswordSwitch.isChecked)
+        showExpirationDateInput(binding.shareProcessSetExpDateSwitch.isChecked)
+    }
+
+    private fun updateViewForShareType() {
+        when (shareType) {
+            ShareType.EMAIL -> {
+                updateViewForExternalShare()
+            }
+
+            ShareType.PUBLIC_LINK -> {
+                updateViewForLinkShare()
+            }
+
+            else -> {
+                updateViewForInternalShare()
+            }
+        }
+    }
+
+    private fun updateViewForExternalShare() {
+        binding.shareProcessChangeNameSwitch.visibility = View.GONE
+        binding.shareProcessChangeNameContainer.visibility = View.GONE
+        updateViewForExternalAndLinkShare()
+    }
+
+    private fun updateViewForLinkShare() {
+        updateViewForExternalAndLinkShare()
+        binding.shareProcessChangeNameSwitch.visibility = View.VISIBLE
+        if (share != null) {
+            binding.shareProcessChangeName.setText(share?.label)
+            binding.shareProcessChangeNameSwitch.isChecked = !TextUtils.isEmpty(share?.label)
+        }
+        showChangeNameInput(binding.shareProcessChangeNameSwitch.isChecked)
+    }
+
+    private fun updateViewForInternalShare() {
+        binding.shareProcessChangeNameSwitch.visibility = View.GONE
+        binding.shareProcessChangeNameContainer.visibility = View.GONE
+        binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
+        if (isSecureShare) {
+            binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+        } else {
+            binding.shareProcessAllowResharingCheckbox.visibility = View.VISIBLE
+        }
+        binding.shareProcessSetPasswordSwitch.visibility = View.GONE
+
+        if (share != null) {
+            if (!isReShareShown) {
+                binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+            }
+            binding.shareProcessAllowResharingCheckbox.isChecked = SharingMenuHelper.canReshare(share)
+        }
+    }
+
+    /**
+     * update views where share type external or link share
+     */
+    private fun updateViewForExternalAndLinkShare() {
+        binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+        binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+        binding.shareProcessSetPasswordSwitch.visibility = View.VISIBLE
+
+        if (share != null) {
+            if (SharingMenuHelper.isFileDrop(share)) {
+                binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
+            } else {
+                binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+                binding.shareProcessHideDownloadCheckbox.isChecked = share?.isHideFileDownload == true
+            }
+        }
+    }
+
+    /**
+     * update expiration date view while modifying the share
+     */
+    private fun updateExpirationDateView() {
+        share?.let { share ->
+            if (share.expirationDate > 0) {
+                chosenExpDateInMills = share.expirationDate
+                binding.shareProcessSetExpDateSwitch.isChecked = true
+                binding.shareProcessSelectExpDate.text = getString(
+                    R.string.share_expiration_date_format,
+                    SimpleDateFormat.getDateInstance().format(Date(share.expirationDate))
+                )
+            }
+        }
+    }
+
+    private fun updateViewForFile() {
+        binding.shareProcessPermissionUploadEditing.text = getString(R.string.link_share_editing)
+        binding.shareProcessPermissionFileDrop.visibility = View.GONE
+    }
+
+    private fun updateViewForFolder() {
+        binding.shareProcessPermissionUploadEditing.text = getString(R.string.link_share_allow_upload_and_editing)
+        binding.shareProcessPermissionFileDrop.visibility = View.VISIBLE
+        if (isSecureShare) {
+            binding.shareProcessPermissionFileDrop.visibility = View.GONE
+            binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+            binding.shareProcessSetExpDateSwitch.visibility = View.GONE
+        }
+    }
+
+    /**
+     * update views for screen type Note
+     */
+    private fun showShareProcessSecond() {
+        binding.shareProcessGroupOne.visibility = View.GONE
+        binding.shareProcessEditShareLink.visibility = View.GONE
+        binding.shareProcessGroupTwo.visibility = View.VISIBLE
+        if (share != null) {
+            binding.shareProcessBtnNext.text = getString(R.string.set_note)
+            binding.noteText.setText(share?.note)
+        } else {
+            binding.shareProcessBtnNext.text = getString(R.string.send_share)
+            binding.noteText.setText(R.string.empty)
+        }
+        shareProcessStep = SCREEN_TYPE_NOTE
+    }
+
+    private fun implementClickEvents() {
+        binding.shareProcessBtnCancel.setOnClickListener {
+            onCancelClick()
+        }
+        binding.shareProcessBtnNext.setOnClickListener {
+            if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
+                validateShareProcessFirst()
+            } else {
+                validateShareProcessSecond()
+            }
+        }
+        binding.shareProcessSetPasswordSwitch.setOnCheckedChangeListener { _, isChecked ->
+            showPasswordInput(isChecked)
+        }
+        binding.shareProcessSetExpDateSwitch.setOnCheckedChangeListener { _, isChecked ->
+            showExpirationDateInput(isChecked)
+        }
+        binding.shareProcessChangeNameSwitch.setOnCheckedChangeListener { _, isChecked ->
+            showChangeNameInput(isChecked)
+        }
+        binding.shareProcessSelectExpDate.setOnClickListener {
+            showExpirationDateDialog()
+        }
+    }
+
+    private fun showExpirationDateDialog(chosenDateInMillis: Long = chosenExpDateInMills) {
+        val dialog = ExpirationDatePickerDialogFragment.newInstance(chosenDateInMillis)
+        dialog.setOnExpiryDateListener(this)
+        expirationDatePickerFragment = dialog
+        dialog.show(supportFragmentManager, ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG)
+    }
+
+    private fun showChangeNameInput(isChecked: Boolean) {
+        binding.shareProcessChangeNameContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+        if (!isChecked) {
+            binding.shareProcessChangeName.setText(R.string.empty)
+        }
+    }
+
+    private fun onCancelClick() {
+        // if modifying the existing share then on back press remove the current activity
+        if (share != null) {
+            finish()
+        }
+
+        // else we have to check if user is in step 2(note screen) then show step 1 (permission screen)
+        // and if user is in step 1 (permission screen) then remove the activity
+        else {
+            if (shareProcessStep == SCREEN_TYPE_NOTE) {
+                showShareProcessFirst()
+            } else {
+                finish()
+            }
+        }
+    }
+
+    private fun showExpirationDateInput(isChecked: Boolean) {
+        binding.shareProcessSelectExpDate.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessExpDateDivider.visibility = if (isChecked) View.VISIBLE else View.GONE
+
+        // reset the expiration date if switch is unchecked
+        if (!isChecked) {
+            chosenExpDateInMills = -1
+            binding.shareProcessSelectExpDate.text = getString(R.string.empty)
+        }
+    }
+
+    private fun showPasswordInput(isChecked: Boolean) {
+        binding.shareProcessEnterPasswordContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+
+        // reset the password if switch is unchecked
+        if (!isChecked) {
+            binding.shareProcessEnterPassword.setText(R.string.empty)
+        }
+    }
+
+
+    private fun getReSharePermission(): Int {
+        val spb = SharePermissionsBuilder()
+        spb.setSharePermission(true)
+        return spb.build()
+    }
+
+    /**
+     * method to validate the step 1 screen information
+     */
+    @Suppress("ReturnCount")
+    private fun validateShareProcessFirst() {
+        permission = getSelectedPermission()
+        if (permission == OCShare.NO_PERMISSION) {
+            DisplayUtils.showSnackMessage(binding.root, R.string.no_share_permission_selected)
+            return
+        }
+
+        if (binding.shareProcessSetPasswordSwitch.isChecked &&
+            binding.shareProcessEnterPassword.text?.trim().isNullOrEmpty()
+        ) {
+            DisplayUtils.showSnackMessage(binding.root, R.string.share_link_empty_password)
+            return
+        }
+
+        if (binding.shareProcessSetExpDateSwitch.isChecked &&
+            binding.shareProcessSelectExpDate.text?.trim().isNullOrEmpty()
+        ) {
+            showExpirationDateDialog()
+            return
+        }
+
+        if (binding.shareProcessChangeNameSwitch.isChecked &&
+            binding.shareProcessChangeName.text?.trim().isNullOrEmpty()
+        ) {
+            DisplayUtils.showSnackMessage(binding.root, R.string.label_empty)
+            return
+        }
+
+        // if modifying existing share information then execute the process
+        if (share != null) {
+            updateShare()
+        } else {
+            // else show step 2 (note screen)
+            showShareProcessSecond()
+        }
+    }
+
+    /**
+     *  get the permissions on the basis of selection
+     */
+    private fun getSelectedPermission() = when {
+        binding.shareProcessAllowResharingCheckbox.isChecked -> getReSharePermission()
+        binding.shareProcessPermissionReadOnly.isChecked -> OCShare.READ_PERMISSION_FLAG
+        binding.shareProcessPermissionUploadEditing.isChecked -> OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
+        binding.shareProcessPermissionFileDrop.isChecked -> OCShare.CREATE_PERMISSION_FLAG
+        else -> permission
+    }
+
+    private fun updateShare() {
+        /*
+        fileOperationsHelper?.updateShareInformation(
+            share,
+            permission,
+            binding.shareProcessHideDownloadCheckbox.isChecked,
+            binding.shareProcessEnterPassword.text.toString().trim(),
+            chosenExpDateInMills,
+            binding.shareProcessChangeName.text.toString().trim()
+        )
+
+        // copy the share link if available
+        if (!TextUtils.isEmpty(share?.shareLink)) {
+            ClipboardUtil.copyToClipboard(this, share?.shareLink)
+        }
+         */
+
+    }
+
+    /**
+     * method to validate step 2 (note screen) information
+     */
+    private fun validateShareProcessSecond() {
+        /*
+        val noteText = binding.noteText.text.toString().trim()
+        // if modifying existing share then directly update the note and send email
+        if (share != null && share?.note != noteText) {
+            fileOperationsHelper?.updateNoteToShare(share, noteText)
+        } else {
+            // else create new share
+            fileOperationsHelper?.shareFileWithSharee(
+                file,
+                shareeName,
+                shareType,
+                permission,
+                binding
+                    .shareProcessHideDownloadCheckbox.isChecked,
+                binding.shareProcessEnterPassword.text.toString().trim(),
+                chosenExpDateInMills,
+                noteText,
+                binding.shareProcessChangeName.text.toString().trim(),
+                true
+            )
+        }
+        onShareProcessClosed()
+         */
+
+    }
+
+    override fun onDateSet(year: Int, monthOfYear: Int, dayOfMonth: Int, chosenDateInMillis: Long) {
+        binding.shareProcessSelectExpDate.text = getString(
+            R.string.share_expiration_date_format,
+            SimpleDateFormat.getDateInstance().format(Date(chosenDateInMillis))
+        )
+        this.chosenExpDateInMills = chosenDateInMillis
+    }
+
+    override fun onDateUnSet() {
+        binding.shareProcessSetExpDateSwitch.isChecked = false
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ExpirationDatePickerDialogFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ExpirationDatePickerDialogFragment.kt
new file mode 100644
index 000000000..54d74dfd1
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ExpirationDatePickerDialogFragment.kt
@@ -0,0 +1,167 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+ * SPDX-FileCopyrightText: 2021 2018 TSI-mc
+ * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-FileCopyrightText: 2015 David A. Velasco <dvelasco@solidgear.es>
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
+ */
+package it.niedermann.owncloud.notes.share.dialog
+
+import android.app.DatePickerDialog
+import android.app.DatePickerDialog.OnDateSetListener
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.format.DateUtils
+import android.widget.DatePicker
+import com.google.android.material.button.MaterialButton
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandedDialogFragment
+import it.niedermann.owncloud.notes.branding.BrandingUtil
+import java.util.Calendar
+
+/**
+ * Dialog requesting a date after today.
+ */
+class ExpirationDatePickerDialogFragment : BrandedDialogFragment(), OnDateSetListener {
+
+
+    private var onExpiryDateListener: OnExpiryDateListener? = null
+
+    fun setOnExpiryDateListener(onExpiryDateListener: OnExpiryDateListener?) {
+        this.onExpiryDateListener = onExpiryDateListener
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return A new dialog to let the user choose an expiration date that will be bound to a share link.
+     */
+    @Suppress("DEPRECATION", "MagicNumber")
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        // Chosen date received as an argument must be later than tomorrow ; default to tomorrow in other case
+        val chosenDate = Calendar.getInstance()
+        val tomorrowInMillis = chosenDate.timeInMillis + DateUtils.DAY_IN_MILLIS
+        val chosenDateInMillis = requireArguments().getLong(ARG_CHOSEN_DATE_IN_MILLIS)
+        chosenDate.timeInMillis = chosenDateInMillis.coerceAtLeast(tomorrowInMillis)
+
+        // Create a new instance of DatePickerDialog
+        val dialog = DatePickerDialog(
+            requireActivity(),
+            R.style.FallbackDatePickerDialogTheme,
+            this,
+            chosenDate[Calendar.YEAR],
+            chosenDate[Calendar.MONTH],
+            chosenDate[Calendar.DAY_OF_MONTH]
+        )
+
+        // show unset button only when date is already selected
+        if (chosenDateInMillis > 0) {
+            dialog.setButton(
+                Dialog.BUTTON_NEGATIVE,
+                getText(R.string.share_via_link_unset_password)
+            ) { _: DialogInterface?, _: Int ->
+                onExpiryDateListener?.onDateUnSet()
+            }
+        }
+
+        // Prevent days in the past may be chosen
+        val picker = dialog.datePicker
+        picker.minDate = tomorrowInMillis - 1000
+
+        // Enforce spinners view; ignored by MD-based theme in Android >=5, but calendar is REALLY buggy
+        // in Android < 5, so let's be sure it never appears (in tablets both spinners and calendar are
+        // shown by default)
+        @Suppress("DEPRECATION")
+        picker.calendarViewShown = false
+        return dialog
+    }
+
+    override fun applyBrand(color: Int) {
+        val util = BrandingUtil.of(color, requireContext())
+        val currentDialog = dialog
+
+        if (currentDialog != null) {
+            val dialog = currentDialog as DatePickerDialog
+
+            val positiveButton = dialog.getButton(DatePickerDialog.BUTTON_POSITIVE) as MaterialButton?
+            if (positiveButton != null) {
+                util?.material?.colorMaterialButtonPrimaryTonal(positiveButton)
+            }
+            val negativeButton = dialog.getButton(DatePickerDialog.BUTTON_NEGATIVE) as MaterialButton?
+            if (negativeButton != null) {
+                util?.material?.colorMaterialButtonPrimaryBorderless(negativeButton)
+            }
+            val neutralButton = dialog.getButton(DatePickerDialog.BUTTON_NEUTRAL) as MaterialButton?
+            if (neutralButton != null) {
+                util?.material?.colorMaterialButtonPrimaryBorderless(neutralButton)
+            }
+        }
+    }
+
+    val currentSelectionMillis: Long
+        get() {
+            val dialog = dialog
+            if (dialog != null) {
+                val datePickerDialog = dialog as DatePickerDialog
+                val picker = datePickerDialog.datePicker
+                return yearMonthDayToMillis(picker.year, picker.month, picker.dayOfMonth)
+            }
+            return 0
+        }
+
+    /**
+     * Called when the user chooses an expiration date.
+     *
+     * @param view        View instance where the date was chosen
+     * @param year        Year of the date chosen.
+     * @param monthOfYear Month of the date chosen [0, 11]
+     * @param dayOfMonth  Day of the date chosen
+     */
+    override fun onDateSet(view: DatePicker, year: Int, monthOfYear: Int, dayOfMonth: Int) {
+        val chosenDateInMillis = yearMonthDayToMillis(year, monthOfYear, dayOfMonth)
+        if (onExpiryDateListener != null) {
+            onExpiryDateListener?.onDateSet(year, monthOfYear, dayOfMonth, chosenDateInMillis)
+        }
+    }
+
+    private fun yearMonthDayToMillis(year: Int, monthOfYear: Int, dayOfMonth: Int): Long {
+        val date = Calendar.getInstance()
+        date[Calendar.YEAR] = year
+        date[Calendar.MONTH] = monthOfYear
+        date[Calendar.DAY_OF_MONTH] = dayOfMonth
+        return date.timeInMillis
+    }
+
+    interface OnExpiryDateListener {
+        fun onDateSet(year: Int, monthOfYear: Int, dayOfMonth: Int, chosenDateInMillis: Long)
+        fun onDateUnSet()
+    }
+
+    companion object {
+        /** Tag for FragmentsManager  */
+        const val DATE_PICKER_DIALOG = "DATE_PICKER_DIALOG"
+
+        /** Parameter constant for date chosen initially  */
+        private const val ARG_CHOSEN_DATE_IN_MILLIS = "CHOSEN_DATE_IN_MILLIS"
+
+        /**
+         * Factory method to create new instances
+         *
+         * @param chosenDateInMillis Date chosen when the dialog appears
+         * @return New dialog instance
+         */
+        fun newInstance(chosenDateInMillis: Long): ExpirationDatePickerDialogFragment {
+            val arguments = Bundle()
+            arguments.putLong(ARG_CHOSEN_DATE_IN_MILLIS, chosenDateInMillis)
+            val dialog = ExpirationDatePickerDialogFragment()
+            dialog.arguments = arguments
+            return dialog
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 973bdde7d..6355e5705 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -54,12 +54,17 @@ public class UsersAndGroupsSearchProvider  {
 
     private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
 
+    public static final String SHARE_TYPE = "SHARE_TYPE";
+    public static final String SHARE_WITH = "SHARE_WITH";
+
     private static final String[] COLUMNS = {
             BaseColumns._ID,
             SearchManager.SUGGEST_COLUMN_TEXT_1,
             SearchManager.SUGGEST_COLUMN_TEXT_2,
             SearchManager.SUGGEST_COLUMN_ICON_1,
-            SearchManager.SUGGEST_COLUMN_INTENT_DATA
+            SearchManager.SUGGEST_COLUMN_INTENT_DATA,
+            SHARE_WITH,
+            SHARE_TYPE
     };
 
     private static final int SEARCH = 1;
@@ -245,7 +250,9 @@ public Cursor searchForUsersOrGroups(String userQuery) {
                                 .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
                                 .add(subline)             // SearchManager.SUGGEST_COLUMN_TEXT_2
                                 .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
-                                .add(dataUri);
+                                .add(dataUri)
+                                .add(SHARE_WITH, shareWith)
+                                .add(SHARE_TYPE, type.getValue());
                     }
 
                 }
diff --git a/app/src/main/res/drawable/file_calendar.xml b/app/src/main/res/drawable/file_calendar.xml
new file mode 100644
index 000000000..2fdb050e8
--- /dev/null
+++ b/app/src/main/res/drawable/file_calendar.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_note_share_detail.xml b/app/src/main/res/layout/activity_note_share_detail.xml
new file mode 100644
index 000000000..4d86ad23b
--- /dev/null
+++ b/app/src/main/res/layout/activity_note_share_detail.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:minHeight="400dp">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/spacer_2x"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_edit_share_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/share_permissions"
+                android:textColor="@color/primary"
+                android:textStyle="bold" />
+
+            <RadioGroup
+                android:id="@+id/share_process_permission_radio_group"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/share_process_permission_read_only"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="@dimen/minimum_size_for_touchable_area"
+                    android:text="@string/link_share_view_only" />
+
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/share_process_permission_upload_editing"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="@dimen/minimum_size_for_touchable_area"
+                    android:text="@string/link_share_allow_upload_and_editing" />
+
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/share_process_permission_file_drop"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="@dimen/minimum_size_for_touchable_area"
+                    android:text="@string/link_share_file_drop" />
+
+            </RadioGroup>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_advance_permission_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:text="@string/advanced_settings"
+                android:textColor="@color/primary"
+                android:textStyle="bold"/>
+
+            <com.google.android.material.checkbox.MaterialCheckBox
+                android:id="@+id/share_process_allow_resharing_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/allow_resharing"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/share_process_set_password_switch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/share_no_password_title"/>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/share_process_enter_password_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_password"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/share_process_enter_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:ems="10"
+                    android:gravity="top"
+                    android:inputType="textPassword">
+
+                </com.google.android.material.textfield.TextInputEditText>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/share_process_set_exp_date_switch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_1x"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/share_no_expiration_date_label"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_select_exp_date"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:padding="@dimen/spacer_1x"
+                android:visibility="gone"
+                app:drawableEndCompat="@drawable/file_calendar"
+                tools:visibility="visible" />
+
+            <View
+                android:id="@+id/share_process_exp_date_divider"
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/text_color" />
+
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/share_process_hide_download_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_1x"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/share_via_link_hide_download"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/share_process_change_name_switch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_1x"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/link_name" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/share_process_change_name_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_name"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/share_process_change_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:gravity="top"
+                    android:importantForAutofill="no"
+                    android:inputType="textNoSuggestions|textCapSentences">
+
+                </com.google.android.material.textfield.TextInputEditText>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/share_process_group_one"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="visible" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_message_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:text="@string/share_send_note"
+                android:textColor="@color/secondary_text_color"/>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/note_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_1x"
+                android:hint="@string/hint_note">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/note_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:importantForAutofill="no"
+                    android:inputType="textCapSentences|textMultiLine|textNoSuggestions"
+                    android:minLines="10"
+                    android:scrollbars="vertical" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/share_process_group_two"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:gravity="end"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/share_process_btn_cancel"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="@dimen/button_width"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacer_1x"
+                    android:text="@string/common_cancel"
+                    app:cornerRadius="@dimen/button_corner_radius" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/share_process_btn_next"
+                    android:layout_width="@dimen/button_extra_width"
+                    android:layout_height="wrap_content"
+                    android:text="@string/common_next"
+                    android:theme="@style/Widget.Material3.Button.IconButton.Filled"
+                    app:cornerRadius="@dimen/button_corner_radius"/>
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_navigation_view_margin" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 05f31608c..707ba348e 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -17,6 +17,8 @@
 
     <color name="cursorHandles">#eee5e5ee</color>
     <color name="defaultTextHighlightBackground">#55eeeeff</color>
+    <color name="secondary_text_color">#A5A5A5</color>
+    <color name="bg_fallback_highlight">#737373</color>
 
     <color name="bg_highlighted">#2a2a2a</color>
     <color name="bg_normal">@color/primary</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1c113295..bd14e44ea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,8 +15,11 @@
     <color name="accent">#121212</color>
     <color name="danger">#d40000</color>
     <color name="text_color">#333333</color>
+    <color name="bg_fallback_highlight">#616161</color>
+    <color name="fg_inverse">#FFFFFF</color>
 
     <color name="defaultBrand">#0082C9</color>
+    <color name="secondary_text_color">#666666</color>
 
     <color name="cursorHandles">#555566</color>
     <color name="defaultTextHighlightBackground">#2233334a</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 856d60fde..c2c7d4080 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,6 +19,10 @@
     <dimen name="spacer_3x">24dp</dimen>
     <dimen name="spacer_4x">36dp</dimen>
     <dimen name="spacer_5x">40dp</dimen>
+    <dimen name="button_width">140dp</dimen>
+    <dimen name="button_corner_radius">24dp</dimen>
+    <dimen name="button_extra_width">180dp</dimen>
+    <dimen name="bottom_navigation_view_margin">100dp</dimen>
 
     <dimen name="avatar_size">36dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b909db466..ebeaf87b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,6 +62,20 @@
     <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
     <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
     <string name="note_share_fragment_share_note">Share note</string>
+    <string name="advanced_settings">Advanced Settings</string>
+    <string name="share_via_link_hide_download">Hide download</string>
+    <string name="share_send_note">Note to recipient</string>
+    <string name="hint_note">Note</string>
+    <string name="common_next">Next</string>
+    <string name="share_copy_link">Share and Copy Link</string>
+    <string name="common_confirm">Confirm</string>
+    <string name="set_note">Set Note</string>
+    <string name="send_share">Send Share</string>
+
+    <string name="hint_name">Name</string>
+
+    <string name="link_name">Link Name</string>
+
     <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
     <string name="note_share_fragment_share_link">Share link</string>
     <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
@@ -70,6 +84,9 @@
     <string name="contact_no_permission">Contact permission is required.</string>
     <string name="share_link_empty_password">You must enter a password</string>
     <string name="hint_password">Password</string>
+    <string name="no_share_permission_selected">Please select at least one permission to share.</string>
+    <string name="label_empty">Label cannot be empty</string>
+
     <string name="share_link_optional_password_title">Enter an optional password</string>
     <string name="common_skip">Skip</string>
     <string name="common_cancel">Cancel</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 837f6c4ca..6720f1725 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,6 +35,21 @@
         <item name="tabStyle">@style/tabStyle</item>
     </style>
 
+    <style name="FallbackDatePickerDialogTheme" parent="Theme.Material3.DayNight.Dialog">
+        <item name="colorPrimary">@color/bg_default</item>
+        <item name="colorAccent">@color/bg_fallback_highlight</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textColor">@color/fg_inverse</item>
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
+    </style>
+
+    <style name="DatePickerStyle">
+        <item name="android:headerBackground">@color/bg_fallback_highlight</item>
+        <item name="android:datePickerMode">calendar</item>
+    </style>
+
+
     <style name="AppTheme" parent="BaseTheme" />
 
     <style name="toolbarStyle" parent="Widget.Material3.Toolbar">

From 2fa741d9c0857185eea1cad9ab65dbc684fbec15 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 29 Jan 2025 16:22:45 +0100
Subject: [PATCH 028/138] cleanup translations

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 10 +-
 .../notes/share/NoteShareDetailActivity.kt    | 16 ++--
 ...ckSharingPermissionsBottomSheetDialog.java |  4 +-
 .../dialog/SharePasswordDialogFragment.kt     | 10 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 83 ++--------------
 .../main/res/layout/activity_note_share.xml   | 14 +--
 .../res/layout/activity_note_share_detail.xml | 18 ++--
 app/src/main/res/layout/activity_row.xml      |  2 +-
 .../main/res/layout/item_add_public_share.xml |  2 +-
 .../res/layout/item_internal_share_link.xml   |  2 +-
 app/src/main/res/layout/item_note_share.xml   |  8 +-
 .../main/res/layout/item_share_link_share.xml |  4 +-
 app/src/main/res/layout/item_share_share.xml  |  4 +-
 .../res/layout/item_suggestion_adapter.xml    |  2 +-
 app/src/main/res/layout/password_dialog.xml   |  2 +-
 .../layout/profile_bottom_sheet_fragment.xml  |  2 +-
 app/src/main/res/values/strings.xml           | 96 ++++++++++---------
 17 files changed, 108 insertions(+), 171 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index fae3de4cf..165de35f9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -161,7 +161,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
 
         ShareRepository repository = ShareRepository.getInstance(getApplicationContext());
-        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, account, repository);
+        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
         binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
@@ -209,7 +209,7 @@ public boolean onSuggestionClick(int position) {
             }
         });
 
-        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_activity_search_text));
         binding.searchView.setInputType(InputType.TYPE_NULL);
     }
 
@@ -283,7 +283,7 @@ private void loadAvatar() {
 
     public void copyInternalLink() {
         if (account == null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.note_share_fragment_could_not_retrieve_url));
+            DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
             return;
         }
 
@@ -297,7 +297,7 @@ private void showShareLinkDialog() {
 
         intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
         intentToShareLink.setType("text/plain");
-        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
+        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_activity_subject_shared_with_you, note.getTitle()));
 
         String[] packagesToExclude = new String[] { this.getPackageName() };
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
@@ -644,7 +644,7 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 if (isGranted) {
                     pickContactEmail();
                 } else {
-                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
+                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.note_share_activity_contact_no_permission), Snackbar.LENGTH_LONG)
                             .show();
                 }
             });
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 7194274a6..88a23523e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -222,9 +222,9 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         // because we have link to share in Public Link
         binding.shareProcessBtnNext.text = getString(
             if (shareType == ShareType.PUBLIC_LINK) {
-                R.string.share_copy_link
+                R.string.note_share_detail_activity_share_copy_link
             } else {
-                R.string.common_confirm
+                R.string.note_share_detail_activity_common_confirm
             }
         )
 
@@ -236,7 +236,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private fun setupUpdateUI() {
-        binding.shareProcessBtnNext.text = getString(R.string.common_next)
+        binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_common_next)
         file.let {
             updateViewForFile()
             updateViewForShareType()
@@ -353,10 +353,10 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         binding.shareProcessEditShareLink.visibility = View.GONE
         binding.shareProcessGroupTwo.visibility = View.VISIBLE
         if (share != null) {
-            binding.shareProcessBtnNext.text = getString(R.string.set_note)
+            binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_set_note)
             binding.noteText.setText(share?.note)
         } else {
-            binding.shareProcessBtnNext.text = getString(R.string.send_share)
+            binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_send_share)
             binding.noteText.setText(R.string.empty)
         }
         shareProcessStep = SCREEN_TYPE_NOTE
@@ -452,14 +452,14 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     private fun validateShareProcessFirst() {
         permission = getSelectedPermission()
         if (permission == OCShare.NO_PERMISSION) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.no_share_permission_selected)
+            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_no_share_permission_selected)
             return
         }
 
         if (binding.shareProcessSetPasswordSwitch.isChecked &&
             binding.shareProcessEnterPassword.text?.trim().isNullOrEmpty()
         ) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.share_link_empty_password)
+            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_share_link_empty_password)
             return
         }
 
@@ -473,7 +473,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         if (binding.shareProcessChangeNameSwitch.isChecked &&
             binding.shareProcessChangeName.text?.trim().isNullOrEmpty()
         ) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.label_empty)
+            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_label_empty)
             return
         }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
index e5360c296..898515ddf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
@@ -116,10 +116,10 @@ private List<QuickPermissionModel> getQuickPermissionList() {
         String[] permissionArray;
         if (ocShare.isFolder()) {
             permissionArray =
-                    activity.getResources().getStringArray(R.array.folder_share_permission_dialog_values);
+                    activity.getResources().getStringArray(R.array.quick_sharing_permission_bottom_sheet_dialog_folder_share_values);
         } else {
             permissionArray =
-                    activity.getResources().getStringArray(R.array.file_share_permission_dialog_values);
+                    activity.getResources().getStringArray(R.array.quick_sharing_permission_bottom_sheet_dialog_note_share_values);
         }
         //get the checked item position
         int checkedItem = SharingMenuHelper.getPermissionCheckedItem(activity, ocShare, permissionArray);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
index 7652c0e40..c195f3744 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
@@ -27,7 +27,7 @@ import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgume
  */
 class SharePasswordDialogFragment : DialogFragment() {
 
-    var keyboardUtils: KeyboardUtils? = null
+    private var keyboardUtils: KeyboardUtils? = null
 
     private var binding: PasswordDialogBinding? = null
     private var note: Note? = null
@@ -52,7 +52,7 @@ class SharePasswordDialogFragment : DialogFragment() {
                         if (!askForPassword && TextUtils.isEmpty(password)) {
                             BrandedSnackbar.make(
                                 binding!!.root,
-                                getString(R.string.share_link_empty_password),
+                                getString(R.string.note_share_detail_activity_share_link_empty_password),
                                 Snackbar.LENGTH_LONG
                             )
                                 .show()
@@ -105,11 +105,11 @@ class SharePasswordDialogFragment : DialogFragment() {
         val neutralButtonTextId: Int
         val title: Int
         if (askForPassword) {
-            title = R.string.share_link_optional_password_title
-            neutralButtonTextId = R.string.common_skip
+            title = R.string.share_password_dialog_fragment_share_link_optional_password_title
+            neutralButtonTextId = R.string.share_password_dialog_fragment_skip
         } else {
             title = R.string.share_link_password_title
-            neutralButtonTextId = R.string.common_cancel
+            neutralButtonTextId = R.string.note_share_detail_activity_cancel
         }
 
         // Build the dialog
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 6355e5705..5d70b63b8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -11,16 +11,12 @@
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.graphics.Bitmap;
 import android.net.Uri;
-import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -31,20 +27,13 @@
 
 import org.json.JSONObject;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.persistence.ShareRepository;
-import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 
 /**
@@ -84,18 +73,14 @@ public class UsersAndGroupsSearchProvider  {
     private final String DATA_EMAIL;
     private final String DATA_CIRCLE;
 
-    private final UriMatcher mUriMatcher;
-
     private final ShareRepository repository;
-    private final Account account;
     private final Context context;
 
-    public UsersAndGroupsSearchProvider(Context context, Account account, ShareRepository repository) {
+    public UsersAndGroupsSearchProvider(Context context, ShareRepository repository) {
         this.context = context;
-        this.account = account;
         this.repository = repository;
 
-        AUTHORITY = context.getString(R.string.users_and_groups_search_authority);
+        AUTHORITY = context.getString(R.string.users_and_groups_search_provider_authority);
         setActionShareWith(context);
         DATA_USER = AUTHORITY + ".data.user";
         DATA_GROUP = AUTHORITY + ".data.group";
@@ -111,18 +96,14 @@ public UsersAndGroupsSearchProvider(Context context, Account account, ShareRepos
         sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
         sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
 
-        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        UriMatcher mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
     }
 
     private static final Map<String, ShareType> sShareTypes = new HashMap<>();
 
-    public static ShareType getShareType(String authority) {
-        return sShareTypes.get(authority);
-    }
-
     private static void setActionShareWith(@NonNull Context context) {
-        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
+        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
     }
 
     public Cursor searchForUsersOrGroups(String userQuery) {
@@ -246,10 +227,10 @@ public Cursor searchForUsersOrGroups(String userQuery) {
 
                     if (displayName != null && dataUri != null) {
                         response.newRow()
-                                .add(count++)             // BaseColumns._ID
-                                .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
-                                .add(subline)             // SearchManager.SUGGEST_COLUMN_TEXT_2
-                                .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
+                                .add(count++)
+                                .add(displayName)
+                                .add(subline)
+                                .add(icon)
                                 .add(dataUri)
                                 .add(SHARE_WITH, shareWith)
                                 .add(SHARE_TYPE, type.getValue());
@@ -265,52 +246,4 @@ public Cursor searchForUsersOrGroups(String userQuery) {
 
         return null;
     }
-
-    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
-        try {
-            Bitmap avatar = Glide.with(context)
-                    .asBitmap()
-                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                    .error(R.drawable.ic_account_circle_grey_24dp)
-                    .apply(RequestOptions.circleCropTransform())
-                    .submit()
-                    .get();
-
-            // create a file to write bitmap data
-            File f = new File(context.getCacheDir(), "test");
-            try {
-                if (f.exists()) {
-                    if (!f.delete()) {
-                        throw new IllegalStateException("Existing file could not be deleted!");
-                    }
-                }
-                if (!f.createNewFile()) {
-                    throw new IllegalStateException("File could not be created!");
-                }
-
-                //Convert bitmap to byte array
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-                avatar.compress(Bitmap.CompressFormat.PNG, 90, bos);
-                byte[] bitmapData = bos.toByteArray();
-
-                //write the bytes in file
-                try (FileOutputStream fos = new FileOutputStream(f)) {
-                    fos.write(bitmapData);
-                } catch (FileNotFoundException e) {
-                    Log_OC.e(TAG, "File not found: " + e.getMessage());
-                }
-
-            } catch (Exception e) {
-                Log_OC.e(TAG, "Error opening file: " + e.getMessage());
-            }
-
-            return ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
-        } catch (ExecutionException e) {
-            throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 1acfb8396..aa50852a8 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -22,7 +22,7 @@
         style="@style/Widget.MaterialComponents.Button.Icon"
         android:paddingStart="@dimen/spacer_3x"
         android:paddingEnd="@dimen/zero"
-        android:text="@string/note_share_fragment_share_note"
+        android:text="@string/note_share_activity_share_note"
         android:textAlignment="textStart"
         android:textColor="@color/text_color"
         app:iconPadding="@dimen/share_button_padding"
@@ -43,7 +43,7 @@
             android:layout_width="@dimen/default_icon_size"
             android:layout_height="@dimen/default_icon_size"
             android:layout_gravity="center_vertical"
-            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:contentDescription="@string/note_share_activity_user_icon_content_description"
             android:padding="@dimen/spacer_1x"
             android:src="@drawable/ic_search_grey600_24dp" />
 
@@ -54,7 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/spacer_1hx"
             android:layout_weight="1"
-            android:hint="@string/note_share_fragment_search_text"
+            android:hint="@string/note_share_activity_search_text"
             app:searchIcon="@null" />
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -63,7 +63,7 @@
             android:layout_height="@dimen/minimum_size_for_touchable_area"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="@dimen/spacer_1hx"
-            android:contentDescription="@string/note_share_fragment_contact_icon_content_description"
+            android:contentDescription="@string/note_share_activity_contact_icon_content_description"
             android:padding="12dp"
             android:src="@drawable/ic_contact_book" />
 
@@ -85,7 +85,7 @@
             android:id="@+id/shared_with_you_avatar"
             android:layout_width="@dimen/default_icon_size"
             android:layout_height="@dimen/default_icon_size"
-            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:contentDescription="@string/note_share_activity_user_icon_content_description"
             android:src="@drawable/ic_account_circle_grey_24dp" />
 
         <LinearLayout
@@ -100,7 +100,7 @@
                 android:id="@+id/shared_with_you_username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/note_share_fragment_shared_with_you"
+                android:text="@string/note_share_activity_shared_with_you"
                 android:textSize="@dimen/note_font_size_small" />
 
             <LinearLayout
@@ -114,7 +114,7 @@
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:contentDescription="@string/note_share_fragment_icon_content_description"
+                    android:contentDescription="@string/note_share_activity_icon_content_description"
                     android:src="@drawable/ic_notes" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_note_share_detail.xml b/app/src/main/res/layout/activity_note_share_detail.xml
index 4d86ad23b..8adc2e5cb 100644
--- a/app/src/main/res/layout/activity_note_share_detail.xml
+++ b/app/src/main/res/layout/activity_note_share_detail.xml
@@ -72,7 +72,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_2x"
-                android:text="@string/advanced_settings"
+                android:text="@string/note_share_detail_activity_advanced_settings"
                 android:textColor="@color/primary"
                 android:textStyle="bold"/>
 
@@ -96,7 +96,7 @@
                 android:id="@+id/share_process_enter_password_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/hint_password"
+                android:hint="@string/note_share_detail_activity_hint_password"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -146,7 +146,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_1x"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
-                android:text="@string/share_via_link_hide_download"
+                android:text="@string/note_share_detail_activity_share_via_link_hide_download"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -156,13 +156,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_1x"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
-                android:text="@string/link_name" />
+                android:text="@string/note_share_detail_activity_link_name" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/share_process_change_name_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/hint_name"
+                android:hint="@string/note_share_detail_activity_hint_name"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -191,7 +191,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_2x"
-                android:text="@string/share_send_note"
+                android:text="@string/note_share_detail_activity_share_send_note"
                 android:textColor="@color/secondary_text_color"/>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -199,7 +199,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_1x"
-                android:hint="@string/hint_note">
+                android:hint="@string/note_share_detail_activity_hint_note">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/note_text"
@@ -232,14 +232,14 @@
                     android:layout_width="@dimen/button_width"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/spacer_1x"
-                    android:text="@string/common_cancel"
+                    android:text="@string/note_share_detail_activity_cancel"
                     app:cornerRadius="@dimen/button_corner_radius" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/share_process_btn_next"
                     android:layout_width="@dimen/button_extra_width"
                     android:layout_height="wrap_content"
-                    android:text="@string/common_next"
+                    android:text="@string/note_share_detail_activity_common_next"
                     android:theme="@style/Widget.Material3.Button.IconButton.Filled"
                     app:cornerRadius="@dimen/button_corner_radius"/>
 
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index 8d6e4d150..ffb8e2e6c 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
+        android:contentDescription="@string/note_share_activity_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/layout/item_add_public_share.xml b/app/src/main/res/layout/item_add_public_share.xml
index 7a58d7311..c31635628 100644
--- a/app/src/main/res/layout/item_add_public_share.xml
+++ b/app/src/main/res/layout/item_add_public_share.xml
@@ -20,7 +20,7 @@
         android:layout_marginStart="@dimen/spacer_2x"
         android:layout_marginEnd="@dimen/spacer_2x"
         android:background="@drawable/round_bgnd"
-        android:contentDescription="@string/note_share_fragment_share_icon_content_description"
+        android:contentDescription="@string/note_share_activity_share_icon_content_description"
         android:padding="@dimen/spacer_1x"
         android:src="@drawable/shared_via_link" />
 
diff --git a/app/src/main/res/layout/item_internal_share_link.xml b/app/src/main/res/layout/item_internal_share_link.xml
index f83e05a46..50157edff 100644
--- a/app/src/main/res/layout/item_internal_share_link.xml
+++ b/app/src/main/res/layout/item_internal_share_link.xml
@@ -20,7 +20,7 @@
 
     <ImageView
         android:background="@drawable/round_bgnd"
-        android:contentDescription="@string/note_share_fragment_external_icon_content_description"
+        android:contentDescription="@string/note_share_activity_external_icon_content_description"
         android:id="@+id/copy_internal_link_icon"
         android:layout_gravity="top"
         android:layout_height="@dimen/default_icon_size"
diff --git a/app/src/main/res/layout/item_note_share.xml b/app/src/main/res/layout/item_note_share.xml
index d76546069..b5a6eadb5 100644
--- a/app/src/main/res/layout/item_note_share.xml
+++ b/app/src/main/res/layout/item_note_share.xml
@@ -25,7 +25,7 @@
         android:layout_marginStart="@dimen/spacer_2x"
         android:layout_marginEnd="@dimen/spacer_2x"
         android:background="@drawable/round_bgnd"
-        android:contentDescription="@string/note_share_fragment_icon_content_description"
+        android:contentDescription="@string/note_share_activity_icon_content_description"
         android:padding="@dimen/spacer_1x"
         android:src="@drawable/shared_via_link" />
 
@@ -44,7 +44,7 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:text="@string/note_share_fragment_share_link"
+            android:text="@string/note_share_activity_share_link"
             android:textColor="@color/fg_default_selection"
             android:textSize="@dimen/note_font_size_small" />
 
@@ -80,7 +80,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:contentDescription="@string/note_share_fragment_copy_icon_content_description"
+        android:contentDescription="@string/note_share_activity_copy_icon_content_description"
         android:paddingStart="@dimen/spacer_2x"
         android:paddingTop="@dimen/spacer_1hx"
         android:paddingEnd="@dimen/spacer_2x"
@@ -92,7 +92,7 @@
         android:id="@+id/overflow_menu"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:contentDescription="@string/note_share_activity_more_icon_content_description"
         android:paddingStart="@dimen/spacer_2x"
         android:paddingEnd="@dimen/spacer_2x"
         android:src="@drawable/ic_dots_vertical" />
diff --git a/app/src/main/res/layout/item_share_link_share.xml b/app/src/main/res/layout/item_share_link_share.xml
index c3723174d..6f558b7db 100644
--- a/app/src/main/res/layout/item_share_link_share.xml
+++ b/app/src/main/res/layout/item_share_link_share.xml
@@ -25,7 +25,7 @@
         android:layout_marginStart="@dimen/spacer_2x"
         android:layout_marginEnd="@dimen/spacer_2x"
         android:background="@drawable/round_bgnd"
-        android:contentDescription="@string/note_share_fragment_share_icon_content_description"
+        android:contentDescription="@string/note_share_activity_share_icon_content_description"
         android:padding="@dimen/spacer_1x"
         android:src="@drawable/shared_via_link" />
 
@@ -92,7 +92,7 @@
         android:id="@+id/overflow_menu"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:contentDescription="@string/note_share_activity_more_icon_content_description"
         android:paddingStart="@dimen/spacer_2x"
         android:paddingEnd="@dimen/spacer_2x"
         android:src="@drawable/ic_dots_vertical" />
diff --git a/app/src/main/res/layout/item_share_share.xml b/app/src/main/res/layout/item_share_share.xml
index cb18c173b..a18cbdfd4 100644
--- a/app/src/main/res/layout/item_share_share.xml
+++ b/app/src/main/res/layout/item_share_share.xml
@@ -27,7 +27,7 @@
         android:layout_marginEnd="@dimen/spacer_2x"
         android:layout_marginRight="@dimen/spacer_2x"
         android:layout_marginBottom="@dimen/spacer_1x"
-        android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+        android:contentDescription="@string/note_share_activity_user_icon_content_description"
         android:src="@drawable/ic_account_circle_grey_24dp" />
 
     <LinearLayout
@@ -67,7 +67,7 @@
         android:id="@+id/overflow_menu"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:contentDescription="@string/note_share_fragment_more_icon_content_description"
+        android:contentDescription="@string/note_share_activity_more_icon_content_description"
         android:paddingStart="@dimen/spacer_2x"
         android:paddingEnd="@dimen/spacer_2x"
         android:src="@drawable/ic_dots_vertical" />
diff --git a/app/src/main/res/layout/item_suggestion_adapter.xml b/app/src/main/res/layout/item_suggestion_adapter.xml
index b00e8d5eb..bf73e1bbc 100644
--- a/app/src/main/res/layout/item_suggestion_adapter.xml
+++ b/app/src/main/res/layout/item_suggestion_adapter.xml
@@ -10,7 +10,7 @@
         android:layout_width="@dimen/default_icon_size"
         android:layout_height="@dimen/default_icon_size"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/note_share_fragment_icon_content_description" />
+        android:contentDescription="@string/note_share_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/suggestion_text"
diff --git a/app/src/main/res/layout/password_dialog.xml b/app/src/main/res/layout/password_dialog.xml
index f56b06660..c93e7acbb 100644
--- a/app/src/main/res/layout/password_dialog.xml
+++ b/app/src/main/res/layout/password_dialog.xml
@@ -14,7 +14,7 @@
         android:id="@+id/share_password_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/hint_password">
+        android:hint="@string/note_share_detail_activity_hint_password">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/share_password"
diff --git a/app/src/main/res/layout/profile_bottom_sheet_fragment.xml b/app/src/main/res/layout/profile_bottom_sheet_fragment.xml
index 377473125..38660f9a4 100644
--- a/app/src/main/res/layout/profile_bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/profile_bottom_sheet_fragment.xml
@@ -28,7 +28,7 @@
             android:layout_marginRight="@dimen/spacer_2x"
             android:layout_marginStart="@dimen/spacer_2x"
             android:layout_marginTop="@dimen/spacer_1x"
-            android:contentDescription="@string/note_share_fragment_user_icon_content_description"
+            android:contentDescription="@string/note_share_activity_user_icon_content_description"
             android:src="@drawable/ic_account_circle_grey_24dp" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ebeaf87b2..04278918d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,59 +38,61 @@
 
     <string name="change_category_title">Choose a category</string>
 
-    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
-    <string name="document_provider_authority">org.nextcloud.documents</string>
-    <string name="file_provider_authority">org.nextcloud.files</string>
-    <string name="image_cache_provider_authority">org.nextcloud.imageCache.provider</string>
-    <string-array name="folder_share_permission_dialog_values" translatable="false">
+    <!-- UsersAndGroupsSearchProvider -->
+    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+
+    <!-- QuickSharingPermissionsBottomSheetDialog -->
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_folder_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_allow_upload_and_editing</item>
         <item>@string/link_share_file_drop</item>
     </string-array>
-    <string-array name="file_share_permission_dialog_values" translatable="false">
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_note_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_editing</item>
     </string-array>
-    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
-    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
-    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
-    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
-    <string name="note_share_fragment_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
-    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
-    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
-    <string name="note_share_fragment_share_note">Share note</string>
-    <string name="advanced_settings">Advanced Settings</string>
-    <string name="share_via_link_hide_download">Hide download</string>
-    <string name="share_send_note">Note to recipient</string>
-    <string name="hint_note">Note</string>
-    <string name="common_next">Next</string>
-    <string name="share_copy_link">Share and Copy Link</string>
-    <string name="common_confirm">Confirm</string>
-    <string name="set_note">Set Note</string>
-    <string name="send_share">Send Share</string>
-
-    <string name="hint_name">Name</string>
-
-    <string name="link_name">Link Name</string>
-
-    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
-    <string name="note_share_fragment_share_link">Share link</string>
-    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
-    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
-    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
-    <string name="contact_no_permission">Contact permission is required.</string>
-    <string name="share_link_empty_password">You must enter a password</string>
-    <string name="hint_password">Password</string>
-    <string name="no_share_permission_selected">Please select at least one permission to share.</string>
-    <string name="label_empty">Label cannot be empty</string>
-
-    <string name="share_link_optional_password_title">Enter an optional password</string>
-    <string name="common_skip">Skip</string>
-    <string name="common_cancel">Cancel</string>
-    <string name="empty" translatable="false" />
+
+    <!-- NoteShareActivity -->
+    <string name="note_share_activity_activity_icon_content_description">note activity icon</string>
+    <string name="note_share_activity_share_icon_content_description">note share icon</string>
+    <string name="note_share_activity_external_icon_content_description">note share external icon</string>
+    <string name="note_share_activity_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_activity_more_icon_content_description">note share more icon</string>
+    <string name="note_share_activity_icon_content_description">note share icon</string>
+    <string name="note_share_activity_user_icon_content_description">note share user icon</string>
+    <string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_activity_share_note">Share note</string>
+    <string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_activity_share_link">Share link</string>
+    <string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
+
+    <!-- NoteShareDetailActivity -->
+    <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
+    <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
+    <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
+    <string name="note_share_detail_activity_hint_note">Note</string>
+    <string name="note_share_detail_activity_common_next">Next</string>
+    <string name="note_share_detail_activity_share_copy_link">Share and Copy Link</string>
+    <string name="note_share_detail_activity_common_confirm">Confirm</string>
+    <string name="note_share_detail_activity_set_note">Set Note</string>
+    <string name="note_share_detail_activity_send_share">Send Share</string>
+    <string name="note_share_detail_activity_hint_name">Name</string>
+    <string name="note_share_detail_activity_link_name">Link Name</string>
+    <string name="note_share_detail_activity_share_link_empty_password">You must enter a password</string>
+    <string name="note_share_detail_activity_hint_password">Password</string>
+    <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
+    <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
+    <string name="note_share_detail_activity_cancel">Cancel</string>
+
+    <!-- SharePasswordDialogFragment -->
+    <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>
+    <string name="share_password_dialog_fragment_skip">Skip</string>
+
     <string name="share_link_password_title">Enter a password</string>
     <string name="common_ok">OK</string>
     <string name="common_delete">Delete</string>
@@ -149,6 +151,8 @@
     <string name="share_known_remote_on_clarification">on %1$s</string>
     <string name="remote">(remote)</string>
 
+    <string name="empty" translatable="false" />
+
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>
     <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>

From fb20691ae64eb9851c981ee1a4433820799ae60c Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 15:18:03 +0100
Subject: [PATCH 029/138] add create share

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/ApiProvider.java        |  2 +
 .../notes/persistence/sync/NotesAPI_0_2.java  |  1 +
 .../notes/persistence/sync/ShareAPI.kt        | 18 +---
 .../notes/share/NoteShareActivity.java        | 11 +--
 .../notes/share/NoteShareDetailActivity.kt    | 42 ++++++++-
 .../helper/UsersAndGroupsSearchProvider.java  |  2 +-
 .../notes/share/model/CreateShareRequest.kt   | 27 ++++++
 .../notes/share/model/CreateShareResponse.kt  | 60 ++++++++++++
 .../CreateShareViaLinkOperation.java          | 91 -------------------
 .../notes/share/operations/SyncOperation.java | 37 --------
 .../repository}/ShareRepository.kt            | 76 ++++++++--------
 11 files changed, 173 insertions(+), 194 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
 rename app/src/main/java/it/niedermann/owncloud/notes/{persistence => share/repository}/ShareRepository.kt (76%)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
index f530277b1..1a42624c6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
@@ -18,6 +18,7 @@
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializer;
+import com.google.gson.Strictness;
 import com.nextcloud.android.sso.api.NextcloudAPI;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 
@@ -115,6 +116,7 @@ private synchronized NextcloudAPI getNextcloudAPI(@NonNull Context context, @Non
             Log.v(TAG, "NextcloudRequest account: " + ssoAccount.name);
             final var nextcloudAPI = new NextcloudAPI(context.getApplicationContext(), ssoAccount,
                     new GsonBuilder()
+                            .setStrictness(Strictness.LENIENT)
                             .excludeFieldsWithoutExposeAnnotation()
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonSerializer<Calendar>) (src, typeOfSrc, ctx) -> new JsonPrimitive(src.getTimeInMillis() / 1_000))
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonDeserializer<Calendar>) (src, typeOfSrc, ctx) -> {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_0_2.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_0_2.java
index fa12f0f0f..060cae353 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_0_2.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_0_2.java
@@ -24,6 +24,7 @@
 import retrofit2.http.Query;
 
 /**
+ *
  * @link <a href="https://github.com/nextcloud/notes/wiki/API-0.2">Notes API v0.2</a>
  */
 public interface NotesAPI_0_2 {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 124c914f3..71d64b888 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -2,12 +2,12 @@ package it.niedermann.owncloud.notes.persistence.sync
 
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
-import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.share.model.CreateShareRequest
+import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
+import retrofit2.http.Body
 import retrofit2.http.DELETE
-import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
@@ -40,16 +40,6 @@ interface ShareAPI {
     @PATCH("shares")
     fun updateShare(remoteShareId: Long): Call<OcsResponse<List<OCShare>>>
 
-    @FormUrlEncoded
     @POST("shares")
-    fun addShare(
-        @Field("remoteFilePath") remoteFilePath: String,
-        @Field("shareType") shareType: ShareType,
-        @Field("shareWith") shareWith: String,
-        @Field("publicUpload") publicUpload: Boolean,
-        @Field("password") password: String,
-        @Field("permissions") permissions: Int,
-        @Field("getShareDetails") getShareDetails: Boolean,
-        @Field("note") note: String
-    ): Call<OcsResponse<List<OCShare>>>
+    fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 165de35f9..ca87bce95 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -46,7 +46,7 @@
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
-import it.niedermann.owncloud.notes.persistence.ShareRepository;
+import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -160,7 +160,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         // avoid fullscreen with softkeyboard
         binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
 
-        ShareRepository repository = ShareRepository.getInstance(getApplicationContext());
+        ShareRepository repository = new ShareRepository(this);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
         binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
@@ -174,12 +174,9 @@ public boolean onQueryTextSubmit(String query) {
             public boolean onQueryTextChange(String newText) {
                 new Thread(() -> {{
                     try (Cursor cursor = provider.searchForUsersOrGroups(newText)) {
-                        if (cursor == null) {
-                            Log_OC.d(TAG,"searchForUsersOrGroups returned null");
-                            return;
+                        if (cursor != null) {
+                            runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
                         }
-
-                        runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
                     } catch (Exception e) {
                         Log_OC.d(TAG,"Exception setupSearchView.onQueryTextChange: " + e);
                     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 88a23523e..b6086e064 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -4,6 +4,9 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
+import androidx.lifecycle.lifecycleScope
+import com.nextcloud.android.sso.helper.SingleAccountHelper
+import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
 import com.owncloud.android.lib.resources.shares.ShareType
@@ -14,9 +17,12 @@ import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
+import it.niedermann.owncloud.notes.share.repository.ShareRepository
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
 import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
 import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -91,7 +97,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private lateinit var binding: ActivityNoteShareDetailBinding
-    private var file: Note? = null // file to be share
+    private var note: Note? = null // note to be share
     private var shareeName: String? = null
     private lateinit var shareType: ShareType
     private var shareProcessStep = SCREEN_TYPE_PERMISSION // default screen type
@@ -104,7 +110,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     private var isSecureShare: Boolean = false
 
     private var expirationDatePickerFragment: ExpirationDatePickerDialogFragment? = null
-
+    private lateinit var repository: ShareRepository
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -114,7 +120,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         val arguments = intent.extras
 
         arguments?.let {
-            file = it.getSerializableArgument(ARG_NOTE, Note::class.java)
+            note = it.getSerializableArgument(ARG_NOTE, Note::class.java)
             shareeName = it.getString(ARG_SHAREE_NAME)
             share = it.getParcelableArgument(ARG_OCSHARE, OCShare::class.java)
 
@@ -132,6 +138,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
 
         // capabilities = CapabilityUtils.getCapability(context)
 
+        repository = ShareRepository(this)
         if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
             showShareProcessFirst()
         } else {
@@ -237,7 +244,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
 
     private fun setupUpdateUI() {
         binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_common_next)
-        file.let {
+        note.let {
             updateViewForFile()
             updateViewForShareType()
         }
@@ -544,6 +551,33 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         onShareProcessClosed()
          */
 
+        val noteText = binding.noteText.text.toString().trim()
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+
+            // if modifying existing share then directly update the note and send email
+            if (share != null && share?.note != noteText) {
+                // repository.updateShare(ssoAcc,share, noteText)
+            } else {
+                if (note == null || shareeName == null) {
+                    Log_OC.d(TAG, "validateShareProcessSecond cancelled")
+                    return@launch
+                }
+
+                // else create new share
+                repository.addShare(
+                    ssoAcc,
+                    note!!,
+                    shareType,
+                    shareeName!!,
+                    "false", // TODO: Check how to determine it
+                    binding.shareProcessEnterPassword.text.toString().trim(),
+                    permission,
+                    noteText
+                )
+            }
+        }
     }
 
     override fun onDateSet(year: Int, monthOfYear: Int, dayOfMonth: Int, chosenDateInMillis: Long) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 5d70b63b8..5632f11ec 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -33,7 +33,7 @@
 import java.util.Map;
 
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.persistence.ShareRepository;
+import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 
 /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
new file mode 100644
index 000000000..52a6fff5a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
@@ -0,0 +1,27 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.google.gson.annotations.Expose
+
+
+data class CreateShareRequest(
+    @Expose
+    val path: String,
+
+    @Expose
+    val shareType: Int,
+
+    @Expose
+    val shareWith: String,
+
+    @Expose
+    val publicUpload: String,
+
+    @Expose
+    val password: String,
+
+    @Expose
+    val permissions: Int,
+
+    @Expose
+    val note: String
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
new file mode 100644
index 000000000..f43c7115e
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
@@ -0,0 +1,60 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.google.gson.annotations.SerializedName
+
+data class CreateShareResponse(
+    val id: String,
+    @SerializedName("share_type")
+    val shareType: Long,
+    @SerializedName("uid_owner")
+    val uidOwner: String,
+    @SerializedName("displayname_owner")
+    val displaynameOwner: String,
+    val permissions: Long,
+    @SerializedName("can_edit")
+    val canEdit: Boolean,
+    @SerializedName("can_delete")
+    val canDelete: Boolean,
+    val stime: Long,
+    @SerializedName("uid_file_owner")
+    val uidFileOwner: String,
+    val note: String,
+    val label: String,
+    @SerializedName("displayname_file_owner")
+    val displaynameFileOwner: String,
+    val path: String,
+    @SerializedName("item_type")
+    val itemType: String,
+    @SerializedName("item_permissions")
+    val itemPermissions: Long,
+    @SerializedName("is-mount-root")
+    val isMountRoot: Boolean,
+    @SerializedName("mount-type")
+    val mountType: String,
+    val mimetype: String,
+    @SerializedName("has_preview")
+    val hasPreview: Boolean,
+    @SerializedName("storage_id")
+    val storageId: String,
+    val storage: Long,
+    @SerializedName("item_source")
+    val itemSource: Long,
+    @SerializedName("file_source")
+    val fileSource: Long,
+    @SerializedName("file_parent")
+    val fileParent: Long,
+    @SerializedName("file_target")
+    val fileTarget: String,
+    @SerializedName("item_size")
+    val itemSize: Long,
+    @SerializedName("item_mtime")
+    val itemMtime: Long,
+    @SerializedName("share_with")
+    val shareWith: String,
+    @SerializedName("share_with_displayname")
+    val shareWithDisplayname: String,
+    @SerializedName("mail_send")
+    val mailSend: Long,
+    @SerializedName("hide_download")
+    val hideDownload: Long,
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
deleted file mode 100644
index 2a49dcb02..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/CreateShareViaLinkOperation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package it.niedermann.owncloud.notes.share.operations;
-
-import java.util.ArrayList;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-/**
- * Creates a new public share for a given file
- */
-public class CreateShareViaLinkOperation extends SyncOperation {
-
-    private final String path;
-    private final String password;
-    private int permissions = OCShare.NO_PERMISSION;
-
-    public CreateShareViaLinkOperation(String path, String password, User user) {
-        super(user);
-
-        this.path = path;
-        this.password = password;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
-                ShareType.PUBLIC_LINK,
-                "",
-                false,
-                password,
-                permissions);
-        createOp.setGetShareDetails(true);
-        RemoteOperationResult result = createOp.execute(client);
-
-        if (result.isSuccess()) {
-            if (result.getData().size() > 0) {
-                Object item = result.getData().get(0);
-                if (item instanceof OCShare) {
-                    updateData((OCShare) item);
-                } else {
-                    ArrayList<Object> data = result.getData();
-                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-                    result.setData(data);
-                }
-            } else {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-            }
-        }
-
-        return result;
-    }
-
-    private void updateData(OCShare share) {
-        // Update DB with the response
-        share.setPath(path);
-        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setFolder(true);
-        } else {
-            share.setFolder(false);
-        }
-
-        // TODO: Save share
-
-        /*
-        getStorageManager().saveShare(share);
-
-        // Update OCFile with data from share: ShareByLink  and publicLink
-        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
-        if (file != null) {
-            file.setSharedViaLink(true);
-            getStorageManager().saveFile(file);
-        }
-         */
-
-    }
-
-    public String getPath() {
-        return this.path;
-    }
-
-    public String getPassword() {
-        return this.password;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
deleted file mode 100644
index 3e4b601be..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/SyncOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package it.niedermann.owncloud.notes.share.operations;
-
-
-import android.content.Context;
-import android.os.Handler;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.User;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-
-import androidx.annotation.NonNull;
-
-public abstract class SyncOperation extends RemoteOperation {
-    private final User user;
-
-    public SyncOperation(@NonNull User user) {
-        this.user = user;
-    }
-
-    public RemoteOperationResult execute(Context context) {
-        return super.execute(user, context);
-    }
-
-    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
-        return run(client);
-    }
-
-    public Thread execute(OwnCloudClient client,
-                          OnRemoteOperationListener listener,
-                          Handler listenerHandler) {
-        return super.execute(client, listener, listenerHandler);
-    }
-
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
similarity index 76%
rename from app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
rename to app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index b5e8d6cce..babdf66bd 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -1,21 +1,22 @@
-package it.niedermann.owncloud.notes.persistence
+package it.niedermann.owncloud.notes.share.repository
 
-import android.app.Application
 import android.content.Context
+import android.util.Log
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.nextcloud.android.sso.model.SingleSignOnAccount
-import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
+import it.niedermann.owncloud.notes.persistence.ApiProvider
+import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import org.json.JSONArray
 import org.json.JSONObject
 
-class ShareRepository private constructor(private val applicationContext: Context) {
+class ShareRepository(private val applicationContext: Context) {
 
     private val apiProvider: ApiProvider by lazy { ApiProvider.getInstance() }
     private val notesRepository: NotesRepository by lazy {
@@ -40,10 +41,10 @@ class ShareRepository private constructor(private val applicationContext: Contex
     ): Single<ArrayList<JSONObject>> {
         return Single.fromCallable {
             val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call2 = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
-            val response2 = call2.execute()
+            val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
+            val response = call.execute()
 
-            val respJSON = JSONObject(response2.body().toString())
+            val respJSON = JSONObject(response.body().toString())
             val respOCS = respJSON.getJSONObject("ocs")
             val respData = respOCS.getJSONObject("data")
             val respExact = respData.getJSONObject("exact")
@@ -162,47 +163,42 @@ class ShareRepository private constructor(private val applicationContext: Contex
         }.subscribeOn(Schedulers.io())
     }
 
+    // TODO: Try with AT_BODY
     fun addShare(
         account: SingleSignOnAccount,
         note: Note,
         shareType: ShareType,
         shareWith: String,
-        publicUpload: Boolean = false,
+        publicUpload: String = "false",
         password: String = "",
         permissions: Int = 0,
-        getShareDetails: Boolean = true,
         shareNote: String = ""
-    ): Single<List<OCShare>> {
-        return getNotesPath(account)
-            .flatMap { notesPath ->
-                Single.fromCallable {
-                    val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-                    val call = shareAPI.addShare(
-                        remoteFilePath = notesPath + "/" + note.remoteId,
-                        shareType = shareType,
-                        shareWith = shareWith,
-                        publicUpload = publicUpload,
-                        password = password,
-                        permissions = permissions,
-                        getShareDetails = getShareDetails,
-                        note = shareNote
-                    )
-                    val response = call.execute()
-                    response.body()?.ocs?.data ?: throw RuntimeException("Share creation failed")
-                }.subscribeOn(Schedulers.io())
-            }
-    }
-
-    companion object {
-        private var instance: ShareRepository? = null
+    ) {
+        val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
+        val notesPathResponse = notesPathCall.execute()
+        val notesPathResponseResult = notesPathResponse.body() ?: return
+        val notesPath = notesPathResponseResult.notesPath
+        val notesSuffix = notesPathResponseResult.fileSuffix
+
+        val requestBody = CreateShareRequest(
+            path = "/" + notesPath + "/" + note.title + notesSuffix,
+            shareType = shareType.value,
+            shareWith = shareWith,
+            publicUpload = publicUpload,
+            password = password,
+            permissions = permissions,
+            note = shareNote
+        )
 
-        @JvmStatic
-        fun getInstance(applicationContext: Context): ShareRepository {
-            require(applicationContext is Application)
-            if (instance == null) {
-                instance = ShareRepository(applicationContext)
-            }
-            return instance!!
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.addShare(request = requestBody)
+        val response = call.execute()
+        if (response.isSuccessful) {
+            val createShareResponse = response.body()
+            Log.d("", "Response successfull: $createShareResponse")
+        } else {
+            val errorBody = response.errorBody()?.string()
+            Log.d("", "Response failed:$errorBody")
         }
     }
 }

From 560aef16e46e8f32081dc383482fcf5de036eec0 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 15:19:06 +0100
Subject: [PATCH 030/138] add create share

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/repository/ShareRepository.kt           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index babdf66bd..8821e896a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -163,7 +163,6 @@ class ShareRepository(private val applicationContext: Context) {
         }.subscribeOn(Schedulers.io())
     }
 
-    // TODO: Try with AT_BODY
     fun addShare(
         account: SingleSignOnAccount,
         note: Note,

From 72d9af133674021e1e7621db4fd954d07d352eb0 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 15:32:45 +0100
Subject: [PATCH 031/138] cleanup

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareDetailActivity.kt    | 91 ++++++++++---------
 .../notes/share/repository/ShareRepository.kt |  6 +-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index b6086e064..90f76ebbe 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -23,6 +23,7 @@ import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
 import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -35,7 +36,8 @@ import java.util.Date
  * 2. This will handle both Advanced Permissions and Send New Email functionality for existing shares to modify them.
  */
 @Suppress("TooManyFunctions")
-class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFragment.OnExpiryDateListener {
+class NoteShareDetailActivity : BrandedActivity(),
+    ExpirationDatePickerDialogFragment.OnExpiryDateListener {
 
     companion object {
         const val TAG = "NoteShareDetailActivity"
@@ -243,7 +245,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private fun setupUpdateUI() {
-        binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_common_next)
+        binding.shareProcessBtnNext.text =
+            getString(R.string.note_share_detail_activity_common_next)
         note.let {
             updateViewForFile()
             updateViewForShareType()
@@ -299,7 +302,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
             if (!isReShareShown) {
                 binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
             }
-            binding.shareProcessAllowResharingCheckbox.isChecked = SharingMenuHelper.canReshare(share)
+            binding.shareProcessAllowResharingCheckbox.isChecked =
+                SharingMenuHelper.canReshare(share)
         }
     }
 
@@ -316,7 +320,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
                 binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
             } else {
                 binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
-                binding.shareProcessHideDownloadCheckbox.isChecked = share?.isHideFileDownload == true
+                binding.shareProcessHideDownloadCheckbox.isChecked =
+                    share?.isHideFileDownload == true
             }
         }
     }
@@ -343,7 +348,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private fun updateViewForFolder() {
-        binding.shareProcessPermissionUploadEditing.text = getString(R.string.link_share_allow_upload_and_editing)
+        binding.shareProcessPermissionUploadEditing.text =
+            getString(R.string.link_share_allow_upload_and_editing)
         binding.shareProcessPermissionFileDrop.visibility = View.VISIBLE
         if (isSecureShare) {
             binding.shareProcessPermissionFileDrop.visibility = View.GONE
@@ -360,10 +366,12 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         binding.shareProcessEditShareLink.visibility = View.GONE
         binding.shareProcessGroupTwo.visibility = View.VISIBLE
         if (share != null) {
-            binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_set_note)
+            binding.shareProcessBtnNext.text =
+                getString(R.string.note_share_detail_activity_set_note)
             binding.noteText.setText(share?.note)
         } else {
-            binding.shareProcessBtnNext.text = getString(R.string.note_share_detail_activity_send_share)
+            binding.shareProcessBtnNext.text =
+                getString(R.string.note_share_detail_activity_send_share)
             binding.noteText.setText(R.string.empty)
         }
         shareProcessStep = SCREEN_TYPE_NOTE
@@ -377,7 +385,7 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
             if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
                 validateShareProcessFirst()
             } else {
-                validateShareProcessSecond()
+                createOrUpdateShare()
             }
         }
         binding.shareProcessSetPasswordSwitch.setOnCheckedChangeListener { _, isChecked ->
@@ -402,7 +410,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private fun showChangeNameInput(isChecked: Boolean) {
-        binding.shareProcessChangeNameContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessChangeNameContainer.visibility =
+            if (isChecked) View.VISIBLE else View.GONE
         if (!isChecked) {
             binding.shareProcessChangeName.setText(R.string.empty)
         }
@@ -437,7 +446,8 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     }
 
     private fun showPasswordInput(isChecked: Boolean) {
-        binding.shareProcessEnterPasswordContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessEnterPasswordContainer.visibility =
+            if (isChecked) View.VISIBLE else View.GONE
 
         // reset the password if switch is unchecked
         if (!isChecked) {
@@ -459,14 +469,20 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
     private fun validateShareProcessFirst() {
         permission = getSelectedPermission()
         if (permission == OCShare.NO_PERMISSION) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_no_share_permission_selected)
+            DisplayUtils.showSnackMessage(
+                binding.root,
+                R.string.note_share_detail_activity_no_share_permission_selected
+            )
             return
         }
 
         if (binding.shareProcessSetPasswordSwitch.isChecked &&
             binding.shareProcessEnterPassword.text?.trim().isNullOrEmpty()
         ) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_share_link_empty_password)
+            DisplayUtils.showSnackMessage(
+                binding.root,
+                R.string.note_share_detail_activity_share_link_empty_password
+            )
             return
         }
 
@@ -480,7 +496,10 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
         if (binding.shareProcessChangeNameSwitch.isChecked &&
             binding.shareProcessChangeName.text?.trim().isNullOrEmpty()
         ) {
-            DisplayUtils.showSnackMessage(binding.root, R.string.note_share_detail_activity_label_empty)
+            DisplayUtils.showSnackMessage(
+                binding.root,
+                R.string.note_share_detail_activity_label_empty
+            )
             return
         }
 
@@ -520,53 +539,28 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
             ClipboardUtil.copyToClipboard(this, share?.shareLink)
         }
          */
-
     }
 
     /**
      * method to validate step 2 (note screen) information
      */
-    private fun validateShareProcessSecond() {
-        /*
-        val noteText = binding.noteText.text.toString().trim()
-        // if modifying existing share then directly update the note and send email
-        if (share != null && share?.note != noteText) {
-            fileOperationsHelper?.updateNoteToShare(share, noteText)
-        } else {
-            // else create new share
-            fileOperationsHelper?.shareFileWithSharee(
-                file,
-                shareeName,
-                shareType,
-                permission,
-                binding
-                    .shareProcessHideDownloadCheckbox.isChecked,
-                binding.shareProcessEnterPassword.text.toString().trim(),
-                chosenExpDateInMills,
-                noteText,
-                binding.shareProcessChangeName.text.toString().trim(),
-                true
-            )
-        }
-        onShareProcessClosed()
-         */
-
+    private fun createOrUpdateShare() {
         val noteText = binding.noteText.text.toString().trim()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+            val ssoAcc =
+                SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
 
             // if modifying existing share then directly update the note and send email
             if (share != null && share?.note != noteText) {
-                // repository.updateShare(ssoAcc,share, noteText)
+                // repository.updateShare(ssoAcc, share, noteText)
             } else {
                 if (note == null || shareeName == null) {
                     Log_OC.d(TAG, "validateShareProcessSecond cancelled")
                     return@launch
                 }
 
-                // else create new share
-                repository.addShare(
+                val result = repository.addShare(
                     ssoAcc,
                     note!!,
                     shareType,
@@ -576,6 +570,17 @@ class NoteShareDetailActivity : BrandedActivity(), ExpirationDatePickerDialogFra
                     permission,
                     noteText
                 )
+
+                withContext(Dispatchers.Main) {
+                    if (result) {
+                        finish()
+                    } else {
+                        DisplayUtils.showSnackMessage(
+                            this@NoteShareDetailActivity,
+                            getString(R.string.note_share_detail_activity_create_share_error)
+                        )
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 8821e896a..8d1dd8bae 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -172,10 +172,10 @@ class ShareRepository(private val applicationContext: Context) {
         password: String = "",
         permissions: Int = 0,
         shareNote: String = ""
-    ) {
+    ): Boolean {
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return
+        val notesPathResponseResult = notesPathResponse.body() ?: return false
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
 
@@ -199,5 +199,7 @@ class ShareRepository(private val applicationContext: Context) {
             val errorBody = response.errorBody()?.string()
             Log.d("", "Response failed:$errorBody")
         }
+
+        return response.isSuccessful
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04278918d..754b001e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
     <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
     <string name="note_share_detail_activity_cancel">Cancel</string>
+    <string name="note_share_detail_activity_create_share_error">Failed to create a share</string>
 
     <!-- SharePasswordDialogFragment -->
     <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>

From 99073a1a37fc6053925e61cf1df5c23db86003b2 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 16:02:30 +0100
Subject: [PATCH 032/138] add progress bar for search

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 60 ++++++++++++-------
 .../main/res/layout/activity_note_share.xml   | 38 +++++++-----
 2 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ca87bce95..5052f6e54 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -39,6 +39,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
@@ -46,7 +50,6 @@
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
-import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -61,6 +64,7 @@
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
 import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
+import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
@@ -73,6 +77,10 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     public static final String ARG_ACCOUNT = "ACCOUNT";
     public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
+    private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+    private Future<?> future;
+    private static final long SEARCH_DELAY_MS = 500;
+
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
@@ -149,38 +157,52 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         }
 
         SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
-        binding.searchView.setSuggestionsAdapter(suggestionAdapter);
+        ShareRepository repository = new ShareRepository(this);
+        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
-        // assumes parent activity is the searchable activity
+        binding.searchView.setSuggestionsAdapter(suggestionAdapter);
         binding.searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
-
-        // do not iconify the widget; expand it by default
         binding.searchView.setIconifiedByDefault(false);
-
-        // avoid fullscreen with softkeyboard
         binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
-
-        ShareRepository repository = new ShareRepository(this);
-        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_activity_search_text));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
         binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-
                 // return true to prevent the query from being processed;
                 return true;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                new Thread(() -> {{
+                binding.progressBar.setVisibility(View.VISIBLE);
+
+                // Cancel the previous task if it's still running
+                if (future != null && !future.isDone()) {
+                    future.cancel(true);
+                }
+
+                // Schedule a new task with a delay
+                future = executorService.schedule(() -> {
                     try (Cursor cursor = provider.searchForUsersOrGroups(newText)) {
-                        if (cursor != null) {
-                            runOnUiThread(() -> suggestionAdapter.changeCursor(cursor));
-                        }
+                        runOnUiThread(() -> {{
+                            if (cursor == null || cursor.getCount() == 0) {
+                                suggestionAdapter.changeCursor(null);
+                                return;
+                            }
+
+                            if (binding.searchView.getVisibility() == View.VISIBLE) {
+                                suggestionAdapter.swapCursor(cursor);
+                            }
+
+                            binding.progressBar.setVisibility(View.GONE);
+                        }});
                     } catch (Exception e) {
-                        Log_OC.d(TAG,"Exception setupSearchView.onQueryTextChange: " + e);
+                        Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
+                        runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
                     }
-                }}).start();
+                }, SEARCH_DELAY_MS, TimeUnit.MILLISECONDS);
+
                 return false;
             }
         });
@@ -205,9 +227,6 @@ public boolean onSuggestionClick(int position) {
                 return true;
             }
         });
-
-        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_activity_search_text));
-        binding.searchView.setInputType(InputType.TYPE_NULL);
     }
 
     private void navigateNoteShareDetail(String shareWith, int shareType) {
@@ -685,6 +704,7 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.androidx.themeToolbarSearchView(binding.searchView);
+        util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
 
     public interface OnEditShareListener {
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index aa50852a8..b4667a60b 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -15,21 +15,6 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/spacer_1hx">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnShareButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/Widget.MaterialComponents.Button.Icon"
-        android:paddingStart="@dimen/spacer_3x"
-        android:paddingEnd="@dimen/zero"
-        android:text="@string/note_share_activity_share_note"
-        android:textAlignment="textStart"
-        android:textColor="@color/text_color"
-        app:iconPadding="@dimen/share_button_padding"
-        app:iconTint="@color/text_color"
-        app:icon="@drawable/ic_share_white_24dp"
-        app:iconGravity="start" />
-
     <LinearLayout
         android:id="@+id/search_container"
         android:layout_width="match_parent"
@@ -57,6 +42,14 @@
             android:hint="@string/note_share_activity_search_text"
             app:searchIcon="@null" />
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            style="@android:style/Widget.ProgressBar.Small" />
+
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/pick_contact_email_btn"
             android:layout_width="@dimen/minimum_size_for_touchable_area"
@@ -69,6 +62,21 @@
 
     </LinearLayout>
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnShareButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.MaterialComponents.Button.Icon"
+        android:paddingStart="@dimen/spacer_3x"
+        android:paddingEnd="@dimen/zero"
+        android:text="@string/note_share_activity_share_note"
+        android:textAlignment="textStart"
+        android:textColor="@color/text_color"
+        app:iconPadding="@dimen/share_button_padding"
+        app:iconTint="@color/text_color"
+        app:icon="@drawable/ic_share_white_24dp"
+        app:iconGravity="start" />
+
     <!-- // TODO: Implement later ... -->
     <LinearLayout
         android:id="@+id/shared_with_you_container"

From f11ba6536026d3b3e80c6a74cd2ace9ce6f9d55f Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 16:06:36 +0100
Subject: [PATCH 033/138] updated CreateShareResponse

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/model/CreateShareResponse.kt  | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
index f43c7115e..b4bf463f1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
@@ -1,60 +1,153 @@
 package it.niedermann.owncloud.notes.share.model
 
+import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
 
 data class CreateShareResponse(
+    @Expose
+    @JvmField
     val id: String,
+
+    @Expose
+    @JvmField
     @SerializedName("share_type")
     val shareType: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("uid_owner")
     val uidOwner: String,
+
+    @Expose
+    @JvmField
     @SerializedName("displayname_owner")
     val displaynameOwner: String,
+
+    @Expose
+    @JvmField
     val permissions: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("can_edit")
     val canEdit: Boolean,
+
+    @Expose
+    @JvmField
     @SerializedName("can_delete")
     val canDelete: Boolean,
+
+    @Expose
+    @JvmField
     val stime: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("uid_file_owner")
     val uidFileOwner: String,
+
+    @Expose
+    @JvmField
     val note: String,
+
+    @Expose
+    @JvmField
     val label: String,
+
+    @Expose
+    @JvmField
     @SerializedName("displayname_file_owner")
     val displaynameFileOwner: String,
+
+    @Expose
+    @JvmField
     val path: String,
+
+    @Expose
+    @JvmField
     @SerializedName("item_type")
     val itemType: String,
+
+    @Expose
+    @JvmField
     @SerializedName("item_permissions")
     val itemPermissions: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("is-mount-root")
     val isMountRoot: Boolean,
+
+    @Expose
+    @JvmField
     @SerializedName("mount-type")
     val mountType: String,
+
+    @Expose
+    @JvmField
     val mimetype: String,
+
+    @Expose
+    @JvmField
     @SerializedName("has_preview")
     val hasPreview: Boolean,
+
+    @Expose
+    @JvmField
     @SerializedName("storage_id")
     val storageId: String,
+
+    @Expose
+    @JvmField
     val storage: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("item_source")
     val itemSource: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("file_source")
     val fileSource: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("file_parent")
     val fileParent: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("file_target")
     val fileTarget: String,
+
+    @Expose
+    @JvmField
     @SerializedName("item_size")
     val itemSize: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("item_mtime")
     val itemMtime: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("share_with")
     val shareWith: String,
+
+    @Expose
+    @JvmField
     @SerializedName("share_with_displayname")
     val shareWithDisplayname: String,
+
+    @Expose
+    @JvmField
     @SerializedName("mail_send")
     val mailSend: Long,
+
+    @Expose
+    @JvmField
     @SerializedName("hide_download")
     val hideDownload: Long,
 )

From 015f6b4c9183b461eb14cd9b4bc8c26e11babee7 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 30 Jan 2025 16:23:36 +0100
Subject: [PATCH 034/138] dont use blocking get

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        |  29 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 272 ++++++++++--------
 2 files changed, 161 insertions(+), 140 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 5052f6e54..9ac27ad9e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -184,19 +184,21 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    try (Cursor cursor = provider.searchForUsersOrGroups(newText)) {
-                        runOnUiThread(() -> {{
-                            if (cursor == null || cursor.getCount() == 0) {
-                                suggestionAdapter.changeCursor(null);
-                                return;
-                            }
-
-                            if (binding.searchView.getVisibility() == View.VISIBLE) {
-                                suggestionAdapter.swapCursor(cursor);
-                            }
-
-                            binding.progressBar.setVisibility(View.GONE);
-                        }});
+                    try {
+                        provider.searchForUsersOrGroups(newText, cursor -> {
+                            runOnUiThread(() -> {{
+                                if (cursor == null || cursor.getCount() == 0) {
+                                    suggestionAdapter.changeCursor(null);
+                                    return;
+                                }
+
+                                if (binding.searchView.getVisibility() == View.VISIBLE) {
+                                    suggestionAdapter.swapCursor(cursor);
+                                }
+
+                                binding.progressBar.setVisibility(View.GONE);
+                            }});
+                        });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
                         runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
@@ -223,6 +225,7 @@ public boolean onSuggestionClick(int position) {
                     String shareWith = cursor.getString(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_WITH));
                     int shareType = cursor.getInt(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_TYPE));
                     navigateNoteShareDetail(shareWith, shareType);
+                    provider.dispose();
                 }
                 return true;
             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 5632f11ec..8e507eaf9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -31,15 +31,18 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Consumer;
 
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 
 /**
  * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
  */
-public class UsersAndGroupsSearchProvider  {
+public class UsersAndGroupsSearchProvider {
 
     private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
 
@@ -75,6 +78,7 @@ public class UsersAndGroupsSearchProvider  {
 
     private final ShareRepository repository;
     private final Context context;
+    private Disposable disposable;
 
     public UsersAndGroupsSearchProvider(Context context, ShareRepository repository) {
         this.context = context;
@@ -106,144 +110,158 @@ private static void setActionShareWith(@NonNull Context context) {
         ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
     }
 
-    public Cursor searchForUsersOrGroups(String userQuery) {
+    public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback) {
         final SingleSignOnAccount ssoAcc;
         try {
             ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
-            final var names = repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE).blockingGet();
-            MatrixCursor response = null;
-            if (!names.isEmpty()) {
-                response = new MatrixCursor(COLUMNS);
-
-                Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
-                Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
-                Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
-                Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
-                Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
-                Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
-
-                Iterator<JSONObject> namesIt = names.iterator();
-                JSONObject item;
-                String displayName;
-                String subline = null;
-                Object icon = 0;
-                Uri dataUri;
-                int count = 0;
-                while (namesIt.hasNext()) {
-                    item = namesIt.next();
-                    dataUri = null;
-                    displayName = null;
-                    String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
-                    String name = item.isNull("name") ? "" : item.getString("name");
-                    JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
-                    ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
-                    String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
-
-                    Status status;
-                    JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
-
-                    if (statusObject != null) {
-                        status = new Status(
-                                StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
-                                statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
-                                statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
-                                statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
-                    } else {
-                        status = new Status(StatusType.OFFLINE, "", "", -1);
-                    }
-
-                    if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
-                        // skip all types but users, as E2E secure share is only allowed to users on same server
-                        // TODO: CHECK SKIP LOGIC
-                       //  continue;
-                    }
-
-                    switch (type) {
-                        case GROUP:
-                            displayName = userName;
-                            icon = R.drawable.ic_group;
-                            dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
-                            break;
-
-                        case FEDERATED:
-                            // TODO: federatedShareAllowed
-                            if (true) {
-                                icon = R.drawable.ic_account_circle_grey_24dp;
-                                dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
-
-                                if (userName.equals(shareWith)) {
-                                    displayName = name;
-                                    subline = context.getString(R.string.remote);
+            disposable = repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(Schedulers.io())
+                    .doOnError(throwable -> {
+                        Log_OC.e(TAG, "Exception while searching", throwable);
+                        callback.accept(null);
+                    })
+                    .subscribe(names -> {
+                        MatrixCursor response = null;
+                        if (!names.isEmpty()) {
+                            response = new MatrixCursor(COLUMNS);
+
+                            Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
+                            Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
+                            Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
+                            Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
+                            Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
+                            Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
+
+                            Iterator<JSONObject> namesIt = names.iterator();
+                            JSONObject item;
+                            String displayName;
+                            String subline = null;
+                            Object icon = 0;
+                            Uri dataUri;
+                            int count = 0;
+                            while (namesIt.hasNext()) {
+                                item = namesIt.next();
+                                dataUri = null;
+                                displayName = null;
+                                String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
+                                String name = item.isNull("name") ? "" : item.getString("name");
+                                JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
+                                ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
+                                String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
+
+                                Status status;
+                                JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
+
+                                if (statusObject != null) {
+                                    status = new Status(
+                                            StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
+                                            statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
+                                            statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
+                                            statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
                                 } else {
-                                    String[] uriSplitted = shareWith.split("@");
-                                    displayName = name;
-                                    subline = context.getString(R.string.share_known_remote_on_clarification,
-                                            uriSplitted[uriSplitted.length - 1]);
+                                    status = new Status(StatusType.OFFLINE, "", "", -1);
+                                }
+
+                                if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                                    // skip all types but users, as E2E secure share is only allowed to users on same server
+                                    // TODO: CHECK SKIP LOGIC
+                                    //  continue;
                                 }
-                            }
-                            break;
 
-                        case USER:
-                            displayName = userName;
-                            subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
-                                    status.getMessage();
-                            Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+                                switch (type) {
+                                    case GROUP:
+                                        displayName = userName;
+                                        icon = R.drawable.ic_group;
+                                        dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
+                                        break;
+
+                                    case FEDERATED:
+                                        // TODO: federatedShareAllowed
+                                        if (true) {
+                                            icon = R.drawable.ic_account_circle_grey_24dp;
+                                            dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
+
+                                            if (userName.equals(shareWith)) {
+                                                displayName = name;
+                                                subline = context.getString(R.string.remote);
+                                            } else {
+                                                String[] uriSplitted = shareWith.split("@");
+                                                displayName = name;
+                                                subline = context.getString(R.string.share_known_remote_on_clarification,
+                                                        uriSplitted[uriSplitted.length - 1]);
+                                            }
+                                        }
+                                        break;
+
+                                    case USER:
+                                        displayName = userName;
+                                        subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
+                                                status.getMessage();
+                                        Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+
+                                        builder.appendQueryParameter("shareWith", shareWith);
+                                        builder.appendQueryParameter("displayName", displayName);
+                                        builder.appendQueryParameter("status", status.getStatus().toString());
+
+                                        if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
+                                            builder.appendQueryParameter("icon", status.getIcon());
+                                        }
+
+                                        icon = builder.build().toString();
+
+                                        dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                                        break;
+
+                                    case EMAIL:
+                                        icon = R.drawable.ic_email;
+                                        displayName = name;
+                                        subline = shareWith;
+                                        dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
+                                        break;
+
+                                    case ROOM:
+                                        icon = R.drawable.ic_talk;
+                                        displayName = userName;
+                                        dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
+                                        break;
+
+                                    case CIRCLE:
+                                        icon = R.drawable.ic_circles;
+                                        displayName = userName;
+                                        dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
+                                        break;
+
+                                    default:
+                                        break;
+                                }
 
-                            builder.appendQueryParameter("shareWith", shareWith);
-                            builder.appendQueryParameter("displayName", displayName);
-                            builder.appendQueryParameter("status", status.getStatus().toString());
+                                if (displayName != null && dataUri != null) {
+                                    response.newRow()
+                                            .add(count++)
+                                            .add(displayName)
+                                            .add(subline)
+                                            .add(icon)
+                                            .add(dataUri)
+                                            .add(SHARE_WITH, shareWith)
+                                            .add(SHARE_TYPE, type.getValue());
+                                }
 
-                            if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
-                                builder.appendQueryParameter("icon", status.getIcon());
                             }
+                        }
 
-                            icon = builder.build().toString();
-
-                            dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
-                            break;
-
-                        case EMAIL:
-                            icon = R.drawable.ic_email;
-                            displayName = name;
-                            subline = shareWith;
-                            dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
-                            break;
-
-                        case ROOM:
-                            icon = R.drawable.ic_talk;
-                            displayName = userName;
-                            dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
-                            break;
-
-                        case CIRCLE:
-                            icon = R.drawable.ic_circles;
-                            displayName = userName;
-                            dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
-                            break;
-
-                        default:
-                            break;
-                    }
-
-                    if (displayName != null && dataUri != null) {
-                        response.newRow()
-                                .add(count++)
-                                .add(displayName)
-                                .add(subline)
-                                .add(icon)
-                                .add(dataUri)
-                                .add(SHARE_WITH, shareWith)
-                                .add(SHARE_TYPE, type.getValue());
-                    }
-
-                }
-            }
-
-            return response;
+                        callback.accept(response);
+                    }, error -> {
+                        Log_OC.e(TAG, "Exception while searching", error);
+                        callback.accept(null);
+                    });
         } catch (Exception e) {
             Log_OC.e(TAG, "Exception while searching", e);
+            callback.accept(null);
         }
+    }
 
-        return null;
+    public void dispose() {
+        disposable.dispose();
     }
 }

From 39b1265a214133022c1cb9ee174332fb9bd39891 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 09:12:19 +0100
Subject: [PATCH 035/138] add update logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  3 ++-
 .../notes/share/NoteShareDetailActivity.kt    | 24 ++++++++---------
 .../notes/share/model/UpdateShareRequest.kt   | 11 ++++++++
 .../notes/share/repository/ShareRepository.kt | 27 ++++++++++++-------
 4 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 71d64b888..e2082efe1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -4,6 +4,7 @@ import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
+import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
 import retrofit2.http.Body
@@ -38,7 +39,7 @@ interface ShareAPI {
     fun deleteShare(remoteShareId: Long): Call<EmptyResponse>
 
     @PATCH("shares")
-    fun updateShare(remoteShareId: Long): Call<OcsResponse<List<OCShare>>>
+    fun updateShare(@Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
     @POST("shares")
     fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 90f76ebbe..59222c72a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -552,15 +552,15 @@ class NoteShareDetailActivity : BrandedActivity(),
                 SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
 
             // if modifying existing share then directly update the note and send email
-            if (share != null && share?.note != noteText) {
-                // repository.updateShare(ssoAcc, share, noteText)
+            val result = if (share != null && share?.note != noteText) {
+                repository.updateShare(ssoAcc, share!!.id, noteText)
             } else {
                 if (note == null || shareeName == null) {
                     Log_OC.d(TAG, "validateShareProcessSecond cancelled")
                     return@launch
                 }
 
-                val result = repository.addShare(
+                repository.addShare(
                     ssoAcc,
                     note!!,
                     shareType,
@@ -570,16 +570,16 @@ class NoteShareDetailActivity : BrandedActivity(),
                     permission,
                     noteText
                 )
+            }
 
-                withContext(Dispatchers.Main) {
-                    if (result) {
-                        finish()
-                    } else {
-                        DisplayUtils.showSnackMessage(
-                            this@NoteShareDetailActivity,
-                            getString(R.string.note_share_detail_activity_create_share_error)
-                        )
-                    }
+            withContext(Dispatchers.Main) {
+                if (result) {
+                    finish()
+                } else {
+                    DisplayUtils.showSnackMessage(
+                        this@NoteShareDetailActivity,
+                        getString(R.string.note_share_detail_activity_create_share_error)
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
new file mode 100644
index 000000000..e5f79c9ae
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -0,0 +1,11 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.google.gson.annotations.Expose
+
+data class UpdateShareRequest(
+    @Expose
+    val shareId: String,
+
+    @Expose
+    val noteText: String
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 8d1dd8bae..2c0f138c9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -12,6 +12,7 @@ import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
+import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import org.json.JSONArray
 import org.json.JSONObject
@@ -153,14 +154,22 @@ class ShareRepository(private val applicationContext: Context) {
 
     fun updateShare(
         account: SingleSignOnAccount,
-        remoteShareId: Long
-    ): Single<List<OCShare>> {
-        return Single.fromCallable {
-            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call = shareAPI.updateShare(remoteShareId)
-            val response = call.execute()
-            response.body()?.ocs?.data ?: throw RuntimeException("Share update failed")
-        }.subscribeOn(Schedulers.io())
+        shareId: Long,
+        noteText: String
+    ): Boolean {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val requestBody = UpdateShareRequest(shareId.toString(), noteText)
+        val call = shareAPI.updateShare(requestBody)
+        val response = call.execute()
+        if (response.isSuccessful) {
+            val updateShareResponse = response.body()
+            Log.d("", "Response successful: $updateShareResponse")
+        } else {
+            val errorBody = response.errorBody()?.string()
+            Log.d("", "Response failed:$errorBody")
+        }
+
+        return response.isSuccessful
     }
 
     fun addShare(
@@ -194,7 +203,7 @@ class ShareRepository(private val applicationContext: Context) {
         val response = call.execute()
         if (response.isSuccessful) {
             val createShareResponse = response.body()
-            Log.d("", "Response successfull: $createShareResponse")
+            Log.d("", "Response successful: $createShareResponse")
         } else {
             val errorBody = response.errorBody()?.string()
             Log.d("", "Response failed:$errorBody")

From bfa547cdef1a9836ac0d16c44827614aef907668 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 09:29:46 +0100
Subject: [PATCH 036/138] add updateShareInformation

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  8 ++++
 .../notes/share/NoteShareDetailActivity.kt    | 38 +++++++++------
 .../notes/share/model/CreateShareResponse.kt  | 31 -------------
 .../model/UpdateShareInformationRequest.kt    | 27 +++++++++++
 .../notes/share/repository/ShareRepository.kt | 46 +++++++++++++++++++
 5 files changed, 106 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index e2082efe1..51f488895 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -4,6 +4,7 @@ import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
+import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
@@ -12,6 +13,7 @@ import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface ShareAPI {
@@ -43,4 +45,10 @@ interface ShareAPI {
 
     @POST("shares")
     fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
+
+    @PATCH("shares/{shareId}")
+    fun updateShareInfo(
+        @Path("shareId") shareId: Long,
+        @Body request: UpdateShareInformationRequest
+    ): Call<OcsResponse<CreateShareResponse>>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 59222c72a..42628a5ba 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -19,6 +19,7 @@ import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragm
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
+import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil
 import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
 import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
 import kotlinx.coroutines.Dispatchers
@@ -524,21 +525,32 @@ class NoteShareDetailActivity : BrandedActivity(),
     }
 
     private fun updateShare() {
-        /*
-        fileOperationsHelper?.updateShareInformation(
-            share,
-            permission,
-            binding.shareProcessHideDownloadCheckbox.isChecked,
-            binding.shareProcessEnterPassword.text.toString().trim(),
-            chosenExpDateInMills,
-            binding.shareProcessChangeName.text.toString().trim()
-        )
+        lifecycleScope.launch(Dispatchers.IO) {
+            val ssoAcc =
+                SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+
+            if (share == null) {
+                Log_OC.d(TAG, "Share is null cannot updateShare")
+                return@launch
+            }
 
-        // copy the share link if available
-        if (!TextUtils.isEmpty(share?.shareLink)) {
-            ClipboardUtil.copyToClipboard(this, share?.shareLink)
+            repository.updateShareInformation(
+                ssoAcc,
+                share!!.id,
+                binding.shareProcessEnterPassword.text.toString().trim(),
+                chosenExpDateInMills,
+                permission,
+                binding.shareProcessHideDownloadCheckbox.isChecked,
+                "", // TODO: Check note?
+                binding.shareProcessChangeName.text.toString().trim()
+            )
+
+            withContext(Dispatchers.Main) {
+                if (!TextUtils.isEmpty(share?.shareLink)) {
+                    ClipboardUtil.copyToClipboard(this@NoteShareDetailActivity, share?.shareLink)
+                }
+            }
         }
-         */
     }
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
index b4bf463f1..7a95c68e8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
@@ -5,149 +5,118 @@ import com.google.gson.annotations.SerializedName
 
 data class CreateShareResponse(
     @Expose
-    @JvmField
     val id: String,
 
     @Expose
-    @JvmField
     @SerializedName("share_type")
     val shareType: Long,
 
     @Expose
-    @JvmField
     @SerializedName("uid_owner")
     val uidOwner: String,
 
     @Expose
-    @JvmField
     @SerializedName("displayname_owner")
     val displaynameOwner: String,
 
     @Expose
-    @JvmField
     val permissions: Long,
 
     @Expose
-    @JvmField
     @SerializedName("can_edit")
     val canEdit: Boolean,
 
     @Expose
-    @JvmField
     @SerializedName("can_delete")
     val canDelete: Boolean,
 
     @Expose
-    @JvmField
     val stime: Long,
 
     @Expose
-    @JvmField
     @SerializedName("uid_file_owner")
     val uidFileOwner: String,
 
     @Expose
-    @JvmField
     val note: String,
 
     @Expose
-    @JvmField
     val label: String,
 
     @Expose
-    @JvmField
     @SerializedName("displayname_file_owner")
     val displaynameFileOwner: String,
 
     @Expose
-    @JvmField
     val path: String,
 
     @Expose
-    @JvmField
     @SerializedName("item_type")
     val itemType: String,
 
     @Expose
-    @JvmField
     @SerializedName("item_permissions")
     val itemPermissions: Long,
 
     @Expose
-    @JvmField
     @SerializedName("is-mount-root")
     val isMountRoot: Boolean,
 
     @Expose
-    @JvmField
     @SerializedName("mount-type")
     val mountType: String,
 
     @Expose
-    @JvmField
     val mimetype: String,
 
     @Expose
-    @JvmField
     @SerializedName("has_preview")
     val hasPreview: Boolean,
 
     @Expose
-    @JvmField
     @SerializedName("storage_id")
     val storageId: String,
 
     @Expose
-    @JvmField
     val storage: Long,
 
     @Expose
-    @JvmField
     @SerializedName("item_source")
     val itemSource: Long,
 
     @Expose
-    @JvmField
     @SerializedName("file_source")
     val fileSource: Long,
 
     @Expose
-    @JvmField
     @SerializedName("file_parent")
     val fileParent: Long,
 
     @Expose
-    @JvmField
     @SerializedName("file_target")
     val fileTarget: String,
 
     @Expose
-    @JvmField
     @SerializedName("item_size")
     val itemSize: Long,
 
     @Expose
-    @JvmField
     @SerializedName("item_mtime")
     val itemMtime: Long,
 
     @Expose
-    @JvmField
     @SerializedName("share_with")
     val shareWith: String,
 
     @Expose
-    @JvmField
     @SerializedName("share_with_displayname")
     val shareWithDisplayname: String,
 
     @Expose
-    @JvmField
     @SerializedName("mail_send")
     val mailSend: Long,
 
     @Expose
-    @JvmField
     @SerializedName("hide_download")
     val hideDownload: Long,
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt
new file mode 100644
index 000000000..a8f129745
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt
@@ -0,0 +1,27 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class UpdateShareInformationRequest(
+    @Expose
+    @SerializedName("shareId") val shareId: String,
+
+    @Expose
+    @SerializedName("password") val password: String? = null,
+
+    @Expose
+    @SerializedName("expireDate") val expireDate: String? = null,
+
+    @Expose
+    @SerializedName("permissions") val permissions: Int? = null,
+
+    @Expose
+    @SerializedName("hideDownload") val hideDownload: Boolean? = null,
+
+    @Expose
+    @SerializedName("note") val note: String? = null,
+
+    @Expose
+    @SerializedName("label") val label: String? = null
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 2c0f138c9..420b74c2d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -1,6 +1,7 @@
 package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
+import android.icu.text.SimpleDateFormat
 import android.util.Log
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.nextcloud.android.sso.model.SingleSignOnAccount
@@ -12,10 +13,13 @@ import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
+import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import org.json.JSONArray
 import org.json.JSONObject
+import java.util.Date
+import java.util.Locale
 
 class ShareRepository(private val applicationContext: Context) {
 
@@ -211,4 +215,46 @@ class ShareRepository(private val applicationContext: Context) {
 
         return response.isSuccessful
     }
+
+    fun updateShareInformation(
+        account: SingleSignOnAccount,
+        shareId: Long,
+        password: String? = null,
+        expirationDateMillis: Long? = null,
+        permissions: Int? = null,
+        hideFileDownload: Boolean? = null,
+        note: String? = null,
+        label: String? = null
+    ): Boolean {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+
+        val expirationDate = expirationDateMillis?.let {
+            SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(it))
+        }
+
+        val requestBody = UpdateShareInformationRequest(
+            shareId = shareId.toString(),
+            password = password,
+            expireDate = expirationDate,
+            permissions = permissions,
+            hideDownload = hideFileDownload,
+            note = note,
+            label = label
+        )
+
+        return try {
+            val call = shareAPI.updateShareInfo(shareId, requestBody)
+            val response = call.execute()
+            if (response.isSuccessful) {
+                Log.d("UpdateShare", "Share updated successfully: ${response.body()}")
+            } else {
+                Log.e("UpdateShare", "Failed to update share: ${response.errorBody()?.string()}")
+            }
+            response.isSuccessful
+        } catch (e: Exception) {
+            Log.e("UpdateShare", "Exception while updating share", e)
+            false
+        }
+    }
+
 }

From 0a159b31d84d7387e6a505c745904f221fa7563b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 10:00:36 +0100
Subject: [PATCH 037/138] add edit

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 15 +++++--
 .../notes/share/NoteShareDetailActivity.kt    | 43 -------------------
 2 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 9ac27ad9e..1a081699f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -611,13 +611,13 @@ public void search(String query) {
 
     @Override
     public void advancedPermissions(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+        modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_PERMISSION);
     }
 
 
     @Override
     public void sendNewEmail(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+        modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_NOTE);
     }
 
     @Override
@@ -649,7 +649,16 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        // editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        Bundle bundle = new Bundle();
+
+        bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
+        bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
+        bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
+
+        Intent intent = new Intent(this, NoteShareDetailActivity.class);
+        intent.putExtras(bundle);
+        startActivity(intent);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 42628a5ba..f8fefe9f0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -54,49 +54,6 @@ class NoteShareDetailActivity : BrandedActivity(),
         // types of screens to be displayed
         const val SCREEN_TYPE_PERMISSION = 1 // permissions screen
         const val SCREEN_TYPE_NOTE = 2 // note screen
-
-        /*
-         /**
-         * fragment instance to be called while creating new share for internal and external share
-         */
-        @JvmStatic
-        fun newInstance(
-            file: OCFile,
-            shareeName: String,
-            shareType: ShareType,
-            secureShare: Boolean
-        ): FileDetailsSharingProcessFragment {
-            val args = Bundle()
-            args.putParcelable(ARG_OCFILE, file)
-            args.putSerializable(ARG_SHARE_TYPE, shareType)
-            args.putString(ARG_SHAREE_NAME, shareeName)
-            args.putBoolean(ARG_SECURE_SHARE, secureShare)
-            val fragment = FileDetailsSharingProcessFragment()
-            fragment.arguments = args
-            return fragment
-        }
-
-        /**
-         * fragment instance to be called while modifying existing share information
-         */
-        @JvmStatic
-        fun newInstance(
-            share: OCShare,
-            screenType: Int,
-            isReshareShown: Boolean,
-            isExpirationDateShown: Boolean
-        ): FileDetailsSharingProcessFragment {
-            val args = Bundle()
-            args.putParcelable(ARG_OCSHARE, share)
-            args.putInt(ARG_SCREEN_TYPE, screenType)
-            args.putBoolean(ARG_RESHARE_SHOWN, isReshareShown)
-            args.putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown)
-            val fragment = FileDetailsSharingProcessFragment()
-            fragment.arguments = args
-            return fragment
-        }
-         */
-
     }
 
     private lateinit var binding: ActivityNoteShareDetailBinding

From b7cedb32842b42c4579ee463c294b41e47b33cfc Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 10:45:15 +0100
Subject: [PATCH 038/138] add missing functionality

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  11 +-
 .../notes/share/NoteShareActivity.java        |  64 ++--
 .../notes/share/NoteShareDetailActivity.kt    |  25 +-
 .../share/adapter/ShareeListAdapter.java      |   7 +-
 .../holder/InternalShareViewHolder.java       |   4 +-
 .../share/adapter/holder/ShareViewHolder.java |   1 -
 ...ckSharingPermissionsBottomSheetDialog.java |  14 +-
 .../notes/share/helper/SharingMenuHelper.java |  14 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 277 +++++++++---------
 .../model/UpdateSharePermissionRequest.kt     |   9 +
 .../RetrieveHoverCardAsyncTask.java           |   6 +-
 .../notes/share/repository/ShareRepository.kt |  68 +++--
 12 files changed, 261 insertions(+), 239 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateSharePermissionRequest.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 51f488895..2465f2e91 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -5,6 +5,7 @@ import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
+import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
@@ -37,8 +38,8 @@ interface ShareAPI {
         subfiles: Boolean
     ): Call<OcsResponse<MutableList<OCShare>>>
 
-    @DELETE("shares")
-    fun deleteShare(remoteShareId: Long): Call<EmptyResponse>
+    @DELETE("shares/{shareId}")
+    fun removeShare(@Path("shareId") shareId: Long): Call<EmptyResponse>
 
     @PATCH("shares")
     fun updateShare(@Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
@@ -51,4 +52,10 @@ interface ShareAPI {
         @Path("shareId") shareId: Long,
         @Body request: UpdateShareInformationRequest
     ): Call<OcsResponse<CreateShareResponse>>
+
+    @PATCH("shares/{shareId}")
+    fun updateSharePermission(
+        @Path("shareId") shareId: Long,
+        @Body request: UpdateSharePermissionRequest
+    ): Call<OcsResponse<CreateShareResponse>>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 1a081699f..6633fa88f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -8,7 +8,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
@@ -31,6 +30,7 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
@@ -85,6 +85,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private Note note;
     private Account account;
     private ClientFactoryImpl clientFactory;
+    private ShareRepository repository;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -92,15 +93,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         initializeArguments();
-
-        binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
-        binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
-        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
-        binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
-
-        setupView();
-        refreshCapabilitiesFromDB();
-        refreshSharesFromDB();
     }
 
     private void initializeArguments() {
@@ -108,6 +100,27 @@ private void initializeArguments() {
         note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
         account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
         clientFactory = new ClientFactoryImpl(this);
+
+        new Thread(() -> {{
+            try {
+                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
+                repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
+
+                runOnUiThread(() -> {
+                    binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
+                    binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
+                    binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+                    binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
+
+                    setupView();
+                    refreshCapabilitiesFromDB();
+                    refreshSharesFromDB();
+                });
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }}).start();
+
         if (note == null) {
             throw new IllegalArgumentException("Note cannot be null");
         }
@@ -157,7 +170,6 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         }
 
         SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
-        ShareRepository repository = new ShareRepository(this);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -433,7 +445,7 @@ private void refreshUiFromDB() {
     }
 
     private void unshareWith(OCShare share) {
-        // fileOperationsHelper.unshareShare(file, share);
+        repository.removeShare(share.getId());
     }
 
     /**
@@ -590,14 +602,6 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putSerializable(ARG_ACCOUNT, account);
     }
 
-    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
-        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
-    }
-
-    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
-        return false;
-    }
-
     private boolean isReshareForbidden(OCShare share) {
         return false;
         // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
@@ -640,7 +644,6 @@ public void sendLink(OCShare share) {
             showSendLinkTo(share);
         }
          */
-
     }
 
     @Override
@@ -663,7 +666,7 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
 
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
-       // fileOperationsHelper.setPermissionsToShare(share, permission);
+       repository.updateSharePermission(share.getId(), permission);
     }
 
     //launcher for contact permission
@@ -701,16 +704,6 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                         }
                     });
 
-    // TODO: IMPLEMENT
-    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown, boolean isExpiryDateShown) {
-
-    }
-
-    // TODO: IMPLEMENT
-    public void onShareProcessClosed() {
-
-    }
-
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
@@ -718,11 +711,4 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
-
-    public interface OnEditShareListener {
-        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                               boolean isExpiryDateShown);
-
-        void onShareProcessClosed();
-    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index f8fefe9f0..d2b46b286 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -98,13 +98,19 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         // capabilities = CapabilityUtils.getCapability(context)
 
-        repository = ShareRepository(this)
-        if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
-            showShareProcessFirst()
-        } else {
-            showShareProcessSecond()
+        lifecycleScope.launch(Dispatchers.IO) {
+            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+            repository = ShareRepository(this@NoteShareDetailActivity, ssoAcc)
+
+            withContext(Dispatchers.Main) {
+                if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
+                    showShareProcessFirst()
+                } else {
+                    showShareProcessSecond()
+                }
+                implementClickEvents()
+            }
         }
-        implementClickEvents()
     }
 
 
@@ -492,7 +498,6 @@ class NoteShareDetailActivity : BrandedActivity(),
             }
 
             repository.updateShareInformation(
-                ssoAcc,
                 share!!.id,
                 binding.shareProcessEnterPassword.text.toString().trim(),
                 chosenExpDateInMills,
@@ -517,12 +522,9 @@ class NoteShareDetailActivity : BrandedActivity(),
         val noteText = binding.noteText.text.toString().trim()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val ssoAcc =
-                SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
-
             // if modifying existing share then directly update the note and send email
             val result = if (share != null && share?.note != noteText) {
-                repository.updateShare(ssoAcc, share!!.id, noteText)
+                repository.updateShare(share!!.id, noteText)
             } else {
                 if (note == null || shareeName == null) {
                     Log_OC.d(TAG, "validateShareProcessSecond cancelled")
@@ -530,7 +532,6 @@ class NoteShareDetailActivity : BrandedActivity(),
                 }
 
                 repository.addShare(
-                    ssoAcc,
                     note!!,
                     shareType,
                     shareeName!!,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index d37a7fc36..eaca06b8e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -7,16 +7,15 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
index 4a7187bac..c322022b1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
@@ -5,12 +5,12 @@
 import android.graphics.PorterDuff;
 import android.view.View;
 
-import com.owncloud.android.lib.resources.shares.OCShare;
-
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.owncloud.android.lib.resources.shares.OCShare;
+
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 6e79ae8e2..c9d1a8e7e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -21,7 +21,6 @@
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.shared.user.User;
 
 public class ShareViewHolder extends RecyclerView.ViewHolder {
     private ItemShareShareBinding binding;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
index 898515ddf..f250e0523 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
@@ -1,11 +1,18 @@
 package it.niedermann.owncloud.notes.share.dialog;
 
 
+import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
+import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.owncloud.android.lib.resources.shares.OCShare;
@@ -13,13 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
-import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
-import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
-
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.QuickSharingPermissionsBottomSheetFragmentBinding;
 import it.niedermann.owncloud.notes.share.adapter.QuickSharingPermissionsAdapter;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
index 5246da0f7..a86b47175 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
@@ -1,6 +1,13 @@
 package it.niedermann.owncloud.notes.share.helper;
 
 
+import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
+import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
+import static com.owncloud.android.lib.resources.shares.OCShare.NO_PERMISSION;
+import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
+import static com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.MenuItem;
@@ -10,13 +17,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
-import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
-import static com.owncloud.android.lib.resources.shares.OCShare.NO_PERMISSION;
-import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG;
-
 import it.niedermann.owncloud.notes.R;
 
 /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 8e507eaf9..46a68d892 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -17,8 +17,6 @@
 
 import androidx.annotation.NonNull;
 
-import com.nextcloud.android.sso.helper.SingleAccountHelper;
-import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -111,154 +109,147 @@ private static void setActionShareWith(@NonNull Context context) {
     }
 
     public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback) {
-        final SingleSignOnAccount ssoAcc;
-        try {
-            ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
-            disposable = repository.getSharees(ssoAcc, userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(Schedulers.io())
-                    .doOnError(throwable -> {
-                        Log_OC.e(TAG, "Exception while searching", throwable);
-                        callback.accept(null);
-                    })
-                    .subscribe(names -> {
-                        MatrixCursor response = null;
-                        if (!names.isEmpty()) {
-                            response = new MatrixCursor(COLUMNS);
-
-                            Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
-                            Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
-                            Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
-                            Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
-                            Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
-                            Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
-
-                            Iterator<JSONObject> namesIt = names.iterator();
-                            JSONObject item;
-                            String displayName;
-                            String subline = null;
-                            Object icon = 0;
-                            Uri dataUri;
-                            int count = 0;
-                            while (namesIt.hasNext()) {
-                                item = namesIt.next();
-                                dataUri = null;
-                                displayName = null;
-                                String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
-                                String name = item.isNull("name") ? "" : item.getString("name");
-                                JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
-                                ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
-                                String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
-
-                                Status status;
-                                JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
-
-                                if (statusObject != null) {
-                                    status = new Status(
-                                            StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
-                                            statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
-                                            statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
-                                            statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
-                                } else {
-                                    status = new Status(StatusType.OFFLINE, "", "", -1);
-                                }
-
-                                if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
-                                    // skip all types but users, as E2E secure share is only allowed to users on same server
-                                    // TODO: CHECK SKIP LOGIC
-                                    //  continue;
-                                }
-
-                                switch (type) {
-                                    case GROUP:
-                                        displayName = userName;
-                                        icon = R.drawable.ic_group;
-                                        dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
-                                        break;
-
-                                    case FEDERATED:
-                                        // TODO: federatedShareAllowed
-                                        if (true) {
-                                            icon = R.drawable.ic_account_circle_grey_24dp;
-                                            dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
-
-                                            if (userName.equals(shareWith)) {
-                                                displayName = name;
-                                                subline = context.getString(R.string.remote);
-                                            } else {
-                                                String[] uriSplitted = shareWith.split("@");
-                                                displayName = name;
-                                                subline = context.getString(R.string.share_known_remote_on_clarification,
-                                                        uriSplitted[uriSplitted.length - 1]);
-                                            }
-                                        }
-                                        break;
-
-                                    case USER:
-                                        displayName = userName;
-                                        subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
-                                                status.getMessage();
-                                        Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+        disposable = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE)
+                .subscribeOn(Schedulers.io())
+                .observeOn(Schedulers.io())
+                .doOnError(throwable -> {
+                    Log_OC.e(TAG, "Exception while searching", throwable);
+                    callback.accept(null);
+                })
+                .subscribe(names -> {
+                    MatrixCursor response = null;
+                    if (!names.isEmpty()) {
+                        response = new MatrixCursor(COLUMNS);
+
+                        Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
+                        Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
+                        Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
+                        Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
+                        Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
+                        Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
+
+                        Iterator<JSONObject> namesIt = names.iterator();
+                        JSONObject item;
+                        String displayName;
+                        String subline = null;
+                        Object icon = 0;
+                        Uri dataUri;
+                        int count = 0;
+                        while (namesIt.hasNext()) {
+                            item = namesIt.next();
+                            dataUri = null;
+                            displayName = null;
+                            String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
+                            String name = item.isNull("name") ? "" : item.getString("name");
+                            JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
+                            ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
+                            String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
+
+                            Status status;
+                            JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
+
+                            if (statusObject != null) {
+                                status = new Status(
+                                        StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
+                                        statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
+                                        statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
+                                        statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
+                            } else {
+                                status = new Status(StatusType.OFFLINE, "", "", -1);
+                            }
 
-                                        builder.appendQueryParameter("shareWith", shareWith);
-                                        builder.appendQueryParameter("displayName", displayName);
-                                        builder.appendQueryParameter("status", status.getStatus().toString());
+                            if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                                // skip all types but users, as E2E secure share is only allowed to users on same server
+                                // TODO: CHECK SKIP LOGIC
+                                //  continue;
+                            }
 
-                                        if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
-                                            builder.appendQueryParameter("icon", status.getIcon());
+                            switch (type) {
+                                case GROUP:
+                                    displayName = userName;
+                                    icon = R.drawable.ic_group;
+                                    dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
+                                    break;
+
+                                case FEDERATED:
+                                    // TODO: federatedShareAllowed
+                                    if (true) {
+                                        icon = R.drawable.ic_account_circle_grey_24dp;
+                                        dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
+
+                                        if (userName.equals(shareWith)) {
+                                            displayName = name;
+                                            subline = context.getString(R.string.remote);
+                                        } else {
+                                            String[] uriSplitted = shareWith.split("@");
+                                            displayName = name;
+                                            subline = context.getString(R.string.share_known_remote_on_clarification,
+                                                    uriSplitted[uriSplitted.length - 1]);
                                         }
+                                    }
+                                    break;
+
+                                case USER:
+                                    displayName = userName;
+                                    subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
+                                            status.getMessage();
+                                    Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+
+                                    builder.appendQueryParameter("shareWith", shareWith);
+                                    builder.appendQueryParameter("displayName", displayName);
+                                    builder.appendQueryParameter("status", status.getStatus().toString());
+
+                                    if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
+                                        builder.appendQueryParameter("icon", status.getIcon());
+                                    }
+
+                                    icon = builder.build().toString();
+
+                                    dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                                    break;
+
+                                case EMAIL:
+                                    icon = R.drawable.ic_email;
+                                    displayName = name;
+                                    subline = shareWith;
+                                    dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
+                                    break;
+
+                                case ROOM:
+                                    icon = R.drawable.ic_talk;
+                                    displayName = userName;
+                                    dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
+                                    break;
+
+                                case CIRCLE:
+                                    icon = R.drawable.ic_circles;
+                                    displayName = userName;
+                                    dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
+                                    break;
+
+                                default:
+                                    break;
+                            }
 
-                                        icon = builder.build().toString();
-
-                                        dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
-                                        break;
-
-                                    case EMAIL:
-                                        icon = R.drawable.ic_email;
-                                        displayName = name;
-                                        subline = shareWith;
-                                        dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
-                                        break;
-
-                                    case ROOM:
-                                        icon = R.drawable.ic_talk;
-                                        displayName = userName;
-                                        dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
-                                        break;
-
-                                    case CIRCLE:
-                                        icon = R.drawable.ic_circles;
-                                        displayName = userName;
-                                        dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
-                                        break;
-
-                                    default:
-                                        break;
-                                }
-
-                                if (displayName != null && dataUri != null) {
-                                    response.newRow()
-                                            .add(count++)
-                                            .add(displayName)
-                                            .add(subline)
-                                            .add(icon)
-                                            .add(dataUri)
-                                            .add(SHARE_WITH, shareWith)
-                                            .add(SHARE_TYPE, type.getValue());
-                                }
-
+                            if (displayName != null && dataUri != null) {
+                                response.newRow()
+                                        .add(count++)
+                                        .add(displayName)
+                                        .add(subline)
+                                        .add(icon)
+                                        .add(dataUri)
+                                        .add(SHARE_WITH, shareWith)
+                                        .add(SHARE_TYPE, type.getValue());
                             }
+
                         }
+                    }
 
-                        callback.accept(response);
-                    }, error -> {
-                        Log_OC.e(TAG, "Exception while searching", error);
-                        callback.accept(null);
-                    });
-        } catch (Exception e) {
-            Log_OC.e(TAG, "Exception while searching", e);
-            callback.accept(null);
-        }
+                    callback.accept(response);
+                }, error -> {
+                    Log_OC.e(TAG, "Exception while searching", error);
+                    callback.accept(null);
+                });
     }
 
     public void dispose() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateSharePermissionRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateSharePermissionRequest.kt
new file mode 100644
index 000000000..99d91f924
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateSharePermissionRequest.kt
@@ -0,0 +1,9 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class UpdateSharePermissionRequest(
+    @Expose
+    @SerializedName("permissions") val permissions: Int? = null,
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
index 507109cca..b1bbde32f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
@@ -3,6 +3,9 @@
 
 import android.os.AsyncTask;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Lifecycle;
+
 import com.nextcloud.android.lib.resources.profile.GetHoverCardRemoteOperation;
 import com.nextcloud.android.lib.resources.profile.HoverCard;
 import com.nextcloud.common.NextcloudClient;
@@ -10,9 +13,6 @@
 
 import java.lang.ref.WeakReference;
 
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.Lifecycle;
-
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.share.dialog.ProfileBottomSheetDialog;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 420b74c2d..80c646256 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -3,8 +3,8 @@ package it.niedermann.owncloud.notes.share.repository
 import android.content.Context
 import android.icu.text.SimpleDateFormat
 import android.util.Log
-import com.nextcloud.android.sso.api.EmptyResponse
 import com.nextcloud.android.sso.model.SingleSignOnAccount
+import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
 import io.reactivex.Single
@@ -14,6 +14,7 @@ import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
+import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import org.json.JSONArray
@@ -21,8 +22,9 @@ import org.json.JSONObject
 import java.util.Date
 import java.util.Locale
 
-class ShareRepository(private val applicationContext: Context) {
+class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
 
+    private val tag = "ShareRepository"
     private val apiProvider: ApiProvider by lazy { ApiProvider.getInstance() }
     private val notesRepository: NotesRepository by lazy {
         NotesRepository.getInstance(
@@ -30,7 +32,7 @@ class ShareRepository(private val applicationContext: Context) {
         )
     }
 
-    private fun getNotesPath(account: SingleSignOnAccount): Single<String> {
+    private fun getNotesPath(): Single<String> {
         return Single.fromCallable {
             val call = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
             val response = call.execute()
@@ -39,7 +41,6 @@ class ShareRepository(private val applicationContext: Context) {
     }
 
     fun getSharees(
-        account: SingleSignOnAccount,
         searchString: String,
         page: Int,
         perPage: Int
@@ -112,7 +113,6 @@ class ShareRepository(private val applicationContext: Context) {
     }
 
     fun getShares(
-        account: SingleSignOnAccount,
         remoteId: Long
     ): Single<List<OCShare>> {
         return Single.fromCallable {
@@ -124,12 +124,11 @@ class ShareRepository(private val applicationContext: Context) {
     }
 
     fun getSharesForFile(
-        account: SingleSignOnAccount,
         note: Note,
         reshares: Boolean = false,
         subfiles: Boolean = false
     ): Single<List<OCShare>> {
-        return getNotesPath(account)
+        return getNotesPath()
             .flatMap { notesPath ->
                 Single.fromCallable {
                     val shareAPI = apiProvider.getShareAPI(applicationContext, account)
@@ -144,20 +143,27 @@ class ShareRepository(private val applicationContext: Context) {
             }
     }
 
-    fun deleteShare(
-        account: SingleSignOnAccount,
-        remoteShareId: Long
-    ): Single<EmptyResponse> {
-        return Single.fromCallable {
-            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call = shareAPI.deleteShare(remoteShareId)
+    fun removeShare(
+        shareId: Long
+    ): Boolean {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+
+        return try {
+            val call = shareAPI.removeShare(shareId)
             val response = call.execute()
-            response.body() ?: throw RuntimeException("No shares available")
-        }.subscribeOn(Schedulers.io())
+            if (response.isSuccessful) {
+                Log.d("RemoveShare", "Share removed successfully.")
+            } else {
+                Log.e("RemoveShare", "Failed to remove share: ${response.errorBody()?.string()}")
+            }
+            response.isSuccessful
+        } catch (e: Exception) {
+            Log.e("RemoveShare", "Exception while removing share", e)
+            false
+        }
     }
 
     fun updateShare(
-        account: SingleSignOnAccount,
         shareId: Long,
         noteText: String
     ): Boolean {
@@ -177,7 +183,6 @@ class ShareRepository(private val applicationContext: Context) {
     }
 
     fun addShare(
-        account: SingleSignOnAccount,
         note: Note,
         shareType: ShareType,
         shareWith: String,
@@ -217,7 +222,6 @@ class ShareRepository(private val applicationContext: Context) {
     }
 
     fun updateShareInformation(
-        account: SingleSignOnAccount,
         shareId: Long,
         password: String? = null,
         expirationDateMillis: Long? = null,
@@ -226,6 +230,11 @@ class ShareRepository(private val applicationContext: Context) {
         note: String? = null,
         label: String? = null
     ): Boolean {
+        if (shareId <= 0) {
+            Log_OC.d(tag, "share id is not valid, updateShareInformation cancelled")
+            return false
+        }
+
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
 
         val expirationDate = expirationDateMillis?.let {
@@ -257,4 +266,25 @@ class ShareRepository(private val applicationContext: Context) {
         }
     }
 
+    fun updateSharePermission(
+        shareId: Long,
+        permissions: Int? = null,
+    ): Boolean {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val requestBody = UpdateSharePermissionRequest(permissions = permissions,)
+
+        return try {
+            val call = shareAPI.updateSharePermission(shareId, requestBody)
+            val response = call.execute()
+            if (response.isSuccessful) {
+                Log.d("UpdateShare", "Share updated successfully: ${response.body()}")
+            } else {
+                Log.e("UpdateShare", "Failed to update share: ${response.errorBody()?.string()}")
+            }
+            response.isSuccessful
+        } catch (e: Exception) {
+            Log.e("UpdateShare", "Exception while updating share", e)
+            false
+        }
+    }
 }

From bd0fc3e548fb9d15e2bf764cdcdc59607dc80118 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 11:30:19 +0100
Subject: [PATCH 039/138] add search_close_btn

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        |  21 ++-
 .../notes/share/repository/ShareRepository.kt | 155 ++++++++++--------
 2 files changed, 98 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 6633fa88f..ce398eb13 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -99,6 +99,13 @@ private void initializeArguments() {
         Bundle bundler = getIntent().getExtras();
         note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
         account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
+        if (note == null) {
+            throw new IllegalArgumentException("Note cannot be null");
+        }
+        if (account == null) {
+            throw new IllegalArgumentException("Account cannot be null");
+        }
+
         clientFactory = new ClientFactoryImpl(this);
 
         new Thread(() -> {{
@@ -120,13 +127,6 @@ private void initializeArguments() {
                 throw new RuntimeException(e);
             }
         }}).start();
-
-        if (note == null) {
-            throw new IllegalArgumentException("Note cannot be null");
-        }
-        if (account == null) {
-            throw new IllegalArgumentException("Account cannot be null");
-        }
     }
 
     @Override
@@ -178,6 +178,13 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         binding.searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
         binding.searchView.setQueryHint(getResources().getString(R.string.note_share_activity_search_text));
         binding.searchView.setInputType(InputType.TYPE_NULL);
+
+        View closeButton = binding.searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
+        closeButton.setOnClickListener(v -> {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.searchView.setQuery("", false);
+        });
+
         binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 80c646256..81f77107e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -45,71 +45,84 @@ class ShareRepository(private val applicationContext: Context, private val accou
         page: Int,
         perPage: Int
     ): Single<ArrayList<JSONObject>> {
-        return Single.fromCallable {
-            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
-            val response = call.execute()
+        return try {
+            Single.fromCallable {
+                val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+                val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
+                val response = call.execute()
 
-            val respJSON = JSONObject(response.body().toString())
-            val respOCS = respJSON.getJSONObject("ocs")
-            val respData = respOCS.getJSONObject("data")
-            val respExact = respData.getJSONObject("exact")
-            val respExactUsers = respExact.getJSONArray("users")
-            val respExactGroups = respExact.getJSONArray("groups")
-            val respExactRemotes = respExact.getJSONArray("remotes")
-            val respExactCircles = if (respExact.has("circles")) {
-                respExact.getJSONArray("circles")
-            } else {
-                JSONArray()
-            }
-            val respExactRooms = if (respExact.has("rooms")) {
-                respExact.getJSONArray("rooms")
-            } else {
-                JSONArray()
-            }
+                if (response.isSuccessful) {
+                    val respJSON = JSONObject(response.body().toString())
+                    val respOCS = respJSON.getJSONObject("ocs")
+                    val respData = respOCS.getJSONObject("data")
+                    val respExact = respData.getJSONObject("exact")
+                    val respExactUsers = respExact.getJSONArray("users")
+                    val respExactGroups = respExact.getJSONArray("groups")
+                    val respExactRemotes = respExact.getJSONArray("remotes")
+                    val respExactCircles = if (respExact.has("circles")) {
+                        respExact.getJSONArray("circles")
+                    } else {
+                        JSONArray()
+                    }
+                    val respExactRooms = if (respExact.has("rooms")) {
+                        respExact.getJSONArray("rooms")
+                    } else {
+                        JSONArray()
+                    }
 
-            val respExactEmails = respExact.getJSONArray("emails")
-            val respPartialUsers = respData.getJSONArray("users")
-            val respPartialGroups = respData.getJSONArray("groups")
-            val respPartialRemotes = respData.getJSONArray("remotes")
-            val respPartialCircles = if (respData.has("circles")) {
-                respData.getJSONArray("circles")
-            } else {
-                JSONArray()
-            }
-            val respPartialRooms = if (respData.has("rooms")) {
-                respData.getJSONArray("rooms")
-            } else {
-                JSONArray()
-            }
+                    val respExactEmails = respExact.getJSONArray("emails")
+                    val respPartialUsers = respData.getJSONArray("users")
+                    val respPartialGroups = respData.getJSONArray("groups")
+                    val respPartialRemotes = respData.getJSONArray("remotes")
+                    val respPartialCircles = if (respData.has("circles")) {
+                        respData.getJSONArray("circles")
+                    } else {
+                        JSONArray()
+                    }
+                    val respPartialRooms = if (respData.has("rooms")) {
+                        respData.getJSONArray("rooms")
+                    } else {
+                        JSONArray()
+                    }
 
-            val jsonResults = arrayOf(
-                respExactUsers,
-                respExactGroups,
-                respExactRemotes,
-                respExactRooms,
-                respExactEmails,
-                respExactCircles,
-                respPartialUsers,
-                respPartialGroups,
-                respPartialRemotes,
-                respPartialRooms,
-                respPartialCircles
-            )
-            val data: ArrayList<JSONObject> = ArrayList()
-            val var25 = jsonResults
-            val var26 = jsonResults.size
+                    val jsonResults = arrayOf(
+                        respExactUsers,
+                        respExactGroups,
+                        respExactRemotes,
+                        respExactRooms,
+                        respExactEmails,
+                        respExactCircles,
+                        respPartialUsers,
+                        respPartialGroups,
+                        respPartialRemotes,
+                        respPartialRooms,
+                        respPartialCircles
+                    )
+                    val data: ArrayList<JSONObject> = ArrayList()
+                    val var25 = jsonResults
+                    val var26 = jsonResults.size
 
-            for (var27 in 0 until var26) {
-                val jsonResult = var25[var27]
+                    for (var27 in 0 until var26) {
+                        val jsonResult = var25[var27]
 
-                for (j in 0 until jsonResult.length()) {
-                    val jsonObject = jsonResult.getJSONObject(j)
-                    data.add(jsonObject)
+                        for (j in 0 until jsonResult.length()) {
+                            val jsonObject = jsonResult.getJSONObject(j)
+                            data.add(jsonObject)
+                        }
+                    }
+                    data
+                } else {
+                    Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
+                    ArrayList()
                 }
+            }.subscribeOn(Schedulers.io())
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while get sharees", e)
+
+            Single.fromCallable {
+                ArrayList()
             }
-            data
-        }.subscribeOn(Schedulers.io())
+        }
     }
 
     fun getShares(
@@ -152,13 +165,13 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val call = shareAPI.removeShare(shareId)
             val response = call.execute()
             if (response.isSuccessful) {
-                Log.d("RemoveShare", "Share removed successfully.")
+                Log_OC.d(tag, "Share removed successfully.")
             } else {
-                Log.e("RemoveShare", "Failed to remove share: ${response.errorBody()?.string()}")
+                Log_OC.d(tag, "Failed to remove share: ${response.errorBody()?.string()}")
             }
             response.isSuccessful
         } catch (e: Exception) {
-            Log.e("RemoveShare", "Exception while removing share", e)
+            Log_OC.d(tag, "Exception while removing share", e)
             false
         }
     }
@@ -173,10 +186,10 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val response = call.execute()
         if (response.isSuccessful) {
             val updateShareResponse = response.body()
-            Log.d("", "Response successful: $updateShareResponse")
+            Log_OC.d(tag, "Response successful: $updateShareResponse")
         } else {
             val errorBody = response.errorBody()?.string()
-            Log.d("", "Response failed:$errorBody")
+            Log_OC.d(tag, "Response failed:$errorBody")
         }
 
         return response.isSuccessful
@@ -212,10 +225,10 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val response = call.execute()
         if (response.isSuccessful) {
             val createShareResponse = response.body()
-            Log.d("", "Response successful: $createShareResponse")
+            Log_OC.d(tag, "Response successful: $createShareResponse")
         } else {
             val errorBody = response.errorBody()?.string()
-            Log.d("", "Response failed:$errorBody")
+            Log_OC.d(tag, "Response failed:$errorBody")
         }
 
         return response.isSuccessful
@@ -255,13 +268,13 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val call = shareAPI.updateShareInfo(shareId, requestBody)
             val response = call.execute()
             if (response.isSuccessful) {
-                Log.d("UpdateShare", "Share updated successfully: ${response.body()}")
+                Log_OC.d(tag, "Share updated successfully: ${response.body()}")
             } else {
-                Log.e("UpdateShare", "Failed to update share: ${response.errorBody()?.string()}")
+                Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
             }
             response.isSuccessful
         } catch (e: Exception) {
-            Log.e("UpdateShare", "Exception while updating share", e)
+            Log_OC.d(tag, "Exception while updating share", e)
             false
         }
     }
@@ -277,13 +290,13 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val call = shareAPI.updateSharePermission(shareId, requestBody)
             val response = call.execute()
             if (response.isSuccessful) {
-                Log.d("UpdateShare", "Share updated successfully: ${response.body()}")
+                Log_OC.d(tag, "Share updated successfully: ${response.body()}")
             } else {
-                Log.e("UpdateShare", "Failed to update share: ${response.errorBody()?.string()}")
+                Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
             }
             response.isSuccessful
         } catch (e: Exception) {
-            Log.e("UpdateShare", "Exception while updating share", e)
+            Log_OC.d(tag, "Exception while updating share", e)
             false
         }
     }

From e1da3991a5e374c04ea4d50b20a56fb887006e14 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 13:36:49 +0100
Subject: [PATCH 040/138] fix UsersAndGroupsSearchProvider

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |   9 +-
 .../notes/persistence/ApiProvider.java        |   2 +
 .../persistence/ResponseBodyTypeAdapter.kt    |  17 +
 .../notes/persistence/sync/ShareAPI.kt        |  10 +-
 .../notes/share/NoteShareActivity.java        |   9 +-
 .../notes/share/adapter/SuggestionAdapter.kt  |  22 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 366 ++++++++++--------
 .../notes/share/repository/ShareRepository.kt | 164 ++++----
 app/src/main/res/values/strings.xml           |   2 +-
 9 files changed, 345 insertions(+), 256 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3940a1917..73a442da6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-
+    <uses-permission android:name="com.owncloud.android.providers.PERMISSION" />
     <queries>
         <package android:name="com.nextcloud.client" />
         <package android:name="com.nextcloud.android.beta" />
@@ -192,5 +192,12 @@
             </intent-filter>
         </service>
 
+        <provider
+            android:name=".share.helper.UsersAndGroupsSearchProvider"
+            android:authorities="@string/users_and_groups_search_authority"
+            android:enabled="true"
+            android:exported="false"
+            android:label="@string/note_share_activity_search_text" />
+
     </application>
 </manifest>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
index 1a42624c6..29a259a44 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
@@ -33,6 +33,7 @@
 import it.niedermann.owncloud.notes.persistence.sync.ShareAPI;
 import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
+import okhttp3.ResponseBody;
 import retrofit2.NextcloudRetrofitApiBuilder;
 import retrofit2.Retrofit;
 
@@ -118,6 +119,7 @@ private synchronized NextcloudAPI getNextcloudAPI(@NonNull Context context, @Non
                     new GsonBuilder()
                             .setStrictness(Strictness.LENIENT)
                             .excludeFieldsWithoutExposeAnnotation()
+                            .registerTypeAdapter(ResponseBody.class, new ResponseBodyTypeAdapter())
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonSerializer<Calendar>) (src, typeOfSrc, ctx) -> new JsonPrimitive(src.getTimeInMillis() / 1_000))
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonDeserializer<Calendar>) (src, typeOfSrc, ctx) -> {
                                 final var calendar = Calendar.getInstance();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt
new file mode 100644
index 000000000..69af5911b
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt
@@ -0,0 +1,17 @@
+package it.niedermann.owncloud.notes.persistence
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.ResponseBody
+
+class ResponseBodyTypeAdapter : TypeAdapter<ResponseBody>() {
+    override fun write(out: JsonWriter, value: ResponseBody?) {
+        throw UnsupportedOperationException("Not needed")
+    }
+
+    override fun read(jsonReader: JsonReader): ResponseBody {
+        return ResponseBody.create("application/json".toMediaTypeOrNull(), jsonReader.nextString())
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 2465f2e91..401cc13f7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -8,7 +8,9 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
+import okhttp3.ResponseBody
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -23,10 +25,10 @@ interface ShareAPI {
         @Query("format") format: String = "json",
         @Query("itemType") itemType: String = "file",
         @Query("search") search: String,
-        @Query("page") page: Int,
-        @Query("perPage") perPage: Int,
-        @Query("lookup") lookup: Boolean = true,
-    ): Call<Any>
+        @Query("page") page: String,
+        @Query("perPage") perPage: String,
+        @Query("lookup") lookup: String = "false",
+    ): Response<ResponseBody>
 
     @GET("shares")
     fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ce398eb13..562810172 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -170,7 +170,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         }
 
         SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
-        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
+        // UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
         binding.searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
@@ -185,7 +185,8 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             binding.searchView.setQuery("", false);
         });
 
-        binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+        /*
+          binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 // return true to prevent the query from being processed;
@@ -227,6 +228,8 @@ public boolean onQueryTextChange(String newText) {
                 return false;
             }
         });
+         */
+
 
         binding.searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
             @Override
@@ -244,7 +247,7 @@ public boolean onSuggestionClick(int position) {
                     String shareWith = cursor.getString(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_WITH));
                     int shareType = cursor.getInt(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_TYPE));
                     navigateNoteShareDetail(shareWith, shareType);
-                    provider.dispose();
+                    // provider.dispose();
                 }
                 return true;
             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
index ac3cc44fb..7f23d59b1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
@@ -10,8 +10,6 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.database.getIntOrNull
-import androidx.core.database.getStringOrNull
 import androidx.cursoradapter.widget.CursorAdapter
 import it.niedermann.owncloud.notes.R
 
@@ -25,15 +23,21 @@ class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(conte
         val suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
         view.findViewById<TextView>(R.id.suggestion_text).text = suggestion
 
+
         val icon = view.findViewById<ImageView>(R.id.suggestion_icon)
+        val iconColumn = cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1)
 
-        val iconId = cursor.getIntOrNull(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1))
-        if (iconId != null) {
-            icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
-        } else {
-            val iconURIAsString = cursor.getStringOrNull(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1)) ?: return
-            val iconURI = Uri.parse(iconURIAsString)
-            icon.setImageURI(iconURI)
+        if (iconColumn != -1) {
+            try {
+                val iconId = cursor.getInt(iconColumn)
+                icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
+            } catch (e: NumberFormatException) {
+                val iconURIAsString = cursor.getString(iconColumn)
+                if (!iconURIAsString.isNullOrEmpty()) {
+                    val iconURI = Uri.parse(iconURIAsString)
+                    icon.setImageURI(iconURI)
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 46a68d892..6a0f50fda 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -7,6 +7,8 @@
 import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_STATUS;
 
 import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
@@ -16,6 +18,7 @@
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
@@ -23,16 +26,14 @@
 import com.owncloud.android.lib.resources.users.Status;
 import com.owncloud.android.lib.resources.users.StatusType;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
-import java.util.function.Consumer;
 
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
@@ -40,7 +41,7 @@
 /**
  * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
  */
-public class UsersAndGroupsSearchProvider {
+public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
 
@@ -66,23 +67,171 @@ public class UsersAndGroupsSearchProvider {
 
     public static final String CONTENT = "content";
 
-    private final String AUTHORITY;
-    private final String DATA_USER;
-    private final String DATA_GROUP;
-    private final String DATA_ROOM;
-    private final String DATA_REMOTE;
-    private final String DATA_EMAIL;
-    private final String DATA_CIRCLE;
+    private String AUTHORITY;
+    private String DATA_USER;
+    private String DATA_GROUP;
+    private String DATA_ROOM;
+    private String DATA_REMOTE;
+    private String DATA_EMAIL;
+    private String DATA_CIRCLE;
 
-    private final ShareRepository repository;
-    private final Context context;
-    private Disposable disposable;
+    private ShareRepository repository;
+    private Context context;
+    private UriMatcher mUriMatcher;
 
-    public UsersAndGroupsSearchProvider(Context context, ShareRepository repository) {
-        this.context = context;
-        this.repository = repository;
 
-        AUTHORITY = context.getString(R.string.users_and_groups_search_provider_authority);
+    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
+
+    private static void setActionShareWith(@NonNull Context context) {
+        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
+    }
+
+    public Cursor searchForUsersOrGroups(Uri uri) throws JSONException {
+        String lastPathSegment = uri.getLastPathSegment();
+        if (lastPathSegment == null) {
+            throw new IllegalArgumentException("Wrong URI passed!");
+        }
+        String userQuery = lastPathSegment.toLowerCase(Locale.ROOT);
+        final var names = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE);
+        MatrixCursor response = null;
+        if (!names.isEmpty()) {
+            response = new MatrixCursor(COLUMNS);
+
+            Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
+            Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
+            Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
+            Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
+            Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
+            Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
+
+            Iterator<JSONObject> namesIt = names.iterator();
+            JSONObject item;
+            String displayName;
+            String subline = null;
+            Object icon = 0;
+            Uri dataUri;
+            int count = 0;
+            while (namesIt.hasNext()) {
+                item = namesIt.next();
+                dataUri = null;
+                displayName = null;
+                String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
+                String name = item.isNull("name") ? "" : item.getString("name");
+                JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
+                ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
+                String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
+
+                Status status;
+                JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
+
+                if (statusObject != null) {
+                    status = new Status(
+                            StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
+                            statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
+                            statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
+                            statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
+                } else {
+                    status = new Status(StatusType.OFFLINE, "", "", -1);
+                }
+
+                if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                    // skip all types but users, as E2E secure share is only allowed to users on same server
+                    // TODO: CHECK SKIP LOGIC
+                    continue;
+                }
+
+                switch (type) {
+                    case GROUP:
+                        displayName = userName;
+                        icon = R.drawable.ic_group;
+                        dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
+                        break;
+
+                    case FEDERATED:
+                        // TODO: federatedShareAllowed
+                        if (true) {
+                            icon = R.drawable.ic_account_circle_grey_24dp;
+                            dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
+
+                            if (userName.equals(shareWith)) {
+                                displayName = name;
+                                subline = context.getString(R.string.remote);
+                            } else {
+                                String[] uriSplitted = shareWith.split("@");
+                                displayName = name;
+                                subline = context.getString(R.string.share_known_remote_on_clarification,
+                                        uriSplitted[uriSplitted.length - 1]);
+                            }
+                        }
+                        break;
+
+                    case USER:
+                        displayName = userName;
+                        subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
+                                status.getMessage();
+                        Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
+
+                        builder.appendQueryParameter("shareWith", shareWith);
+                        builder.appendQueryParameter("displayName", displayName);
+                        builder.appendQueryParameter("status", status.getStatus().toString());
+
+                        if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
+                            builder.appendQueryParameter("icon", status.getIcon());
+                        }
+
+                        icon = builder.build().toString();
+
+                        dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                        break;
+
+                    case EMAIL:
+                        icon = R.drawable.ic_email;
+                        displayName = name;
+                        subline = shareWith;
+                        dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
+                        break;
+
+                    case ROOM:
+                        icon = R.drawable.ic_talk;
+                        displayName = userName;
+                        dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
+                        break;
+
+                    case CIRCLE:
+                        icon = R.drawable.ic_circles;
+                        displayName = userName;
+                        dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
+                        break;
+
+                    default:
+                        break;
+                }
+
+                if (displayName != null && dataUri != null) {
+                    response.newRow()
+                            .add(count++)
+                            .add(displayName)
+                            .add(subline)
+                            .add(icon)
+                            .add(dataUri)
+                            .add(SHARE_WITH, shareWith)
+                            .add(SHARE_TYPE, type.getValue());
+                }
+            }
+
+            return response;
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        if (getContext() == null) {
+            return false;
+        }
+
+        AUTHORITY = context.getString(R.string.users_and_groups_search_authority);
         setActionShareWith(context);
         DATA_USER = AUTHORITY + ".data.user";
         DATA_GROUP = AUTHORITY + ".data.group";
@@ -98,161 +247,48 @@ public UsersAndGroupsSearchProvider(Context context, ShareRepository repository)
         sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
         sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
 
-        UriMatcher mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
-    }
-
-    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
 
-    private static void setActionShareWith(@NonNull Context context) {
-        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
+        return true;
     }
 
-    public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback) {
-        disposable = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE)
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .doOnError(throwable -> {
-                    Log_OC.e(TAG, "Exception while searching", throwable);
-                    callback.accept(null);
-                })
-                .subscribe(names -> {
-                    MatrixCursor response = null;
-                    if (!names.isEmpty()) {
-                        response = new MatrixCursor(COLUMNS);
-
-                        Uri userBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_USER).build();
-                        Uri groupBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_GROUP).build();
-                        Uri roomBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_ROOM).build();
-                        Uri remoteBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_REMOTE).build();
-                        Uri emailBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_EMAIL).build();
-                        Uri circleBaseUri = new Uri.Builder().scheme(CONTENT).authority(DATA_CIRCLE).build();
-
-                        Iterator<JSONObject> namesIt = names.iterator();
-                        JSONObject item;
-                        String displayName;
-                        String subline = null;
-                        Object icon = 0;
-                        Uri dataUri;
-                        int count = 0;
-                        while (namesIt.hasNext()) {
-                            item = namesIt.next();
-                            dataUri = null;
-                            displayName = null;
-                            String userName = item.getString(GetShareesRemoteOperation.PROPERTY_LABEL);
-                            String name = item.isNull("name") ? "" : item.getString("name");
-                            JSONObject value = item.getJSONObject(GetShareesRemoteOperation.NODE_VALUE);
-                            ShareType type = ShareType.fromValue(value.getInt(GetShareesRemoteOperation.PROPERTY_SHARE_TYPE));
-                            String shareWith = value.getString(GetShareesRemoteOperation.PROPERTY_SHARE_WITH);
-
-                            Status status;
-                            JSONObject statusObject = item.optJSONObject(PROPERTY_STATUS);
-
-                            if (statusObject != null) {
-                                status = new Status(
-                                        StatusType.valueOf(statusObject.getString(PROPERTY_STATUS).toUpperCase(Locale.US)),
-                                        statusObject.isNull(PROPERTY_MESSAGE) ? "" : statusObject.getString(PROPERTY_MESSAGE),
-                                        statusObject.isNull(PROPERTY_ICON) ? "" : statusObject.getString(PROPERTY_ICON),
-                                        statusObject.isNull(PROPERTY_CLEAR_AT) ? -1 : statusObject.getLong(PROPERTY_CLEAR_AT));
-                            } else {
-                                status = new Status(StatusType.OFFLINE, "", "", -1);
-                            }
-
-                            if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
-                                // skip all types but users, as E2E secure share is only allowed to users on same server
-                                // TODO: CHECK SKIP LOGIC
-                                //  continue;
-                            }
-
-                            switch (type) {
-                                case GROUP:
-                                    displayName = userName;
-                                    icon = R.drawable.ic_group;
-                                    dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
-                                    break;
-
-                                case FEDERATED:
-                                    // TODO: federatedShareAllowed
-                                    if (true) {
-                                        icon = R.drawable.ic_account_circle_grey_24dp;
-                                        dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
-
-                                        if (userName.equals(shareWith)) {
-                                            displayName = name;
-                                            subline = context.getString(R.string.remote);
-                                        } else {
-                                            String[] uriSplitted = shareWith.split("@");
-                                            displayName = name;
-                                            subline = context.getString(R.string.share_known_remote_on_clarification,
-                                                    uriSplitted[uriSplitted.length - 1]);
-                                        }
-                                    }
-                                    break;
-
-                                case USER:
-                                    displayName = userName;
-                                    subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
-                                            status.getMessage();
-                                    Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
-
-                                    builder.appendQueryParameter("shareWith", shareWith);
-                                    builder.appendQueryParameter("displayName", displayName);
-                                    builder.appendQueryParameter("status", status.getStatus().toString());
-
-                                    if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
-                                        builder.appendQueryParameter("icon", status.getIcon());
-                                    }
-
-                                    icon = builder.build().toString();
-
-                                    dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
-                                    break;
-
-                                case EMAIL:
-                                    icon = R.drawable.ic_email;
-                                    displayName = name;
-                                    subline = shareWith;
-                                    dataUri = Uri.withAppendedPath(emailBaseUri, shareWith);
-                                    break;
-
-                                case ROOM:
-                                    icon = R.drawable.ic_talk;
-                                    displayName = userName;
-                                    dataUri = Uri.withAppendedPath(roomBaseUri, shareWith);
-                                    break;
-
-                                case CIRCLE:
-                                    icon = R.drawable.ic_circles;
-                                    displayName = userName;
-                                    dataUri = Uri.withAppendedPath(circleBaseUri, shareWith);
-                                    break;
-
-                                default:
-                                    break;
-                            }
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+        Log_OC.d(TAG, "query received in thread " + Thread.currentThread().getName());
+
+        int match = mUriMatcher.match(uri);
+        if (match == SEARCH) {
+            try {
+                return searchForUsersOrGroups(uri);
+            } catch (JSONException e) {
+                return null;
+            }
+        }
+
+        return null;
+    }
 
-                            if (displayName != null && dataUri != null) {
-                                response.newRow()
-                                        .add(count++)
-                                        .add(displayName)
-                                        .add(subline)
-                                        .add(icon)
-                                        .add(dataUri)
-                                        .add(SHARE_WITH, shareWith)
-                                        .add(SHARE_TYPE, type.getValue());
-                            }
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
 
-                        }
-                    }
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
 
-                    callback.accept(response);
-                }, error -> {
-                    Log_OC.e(TAG, "Exception while searching", error);
-                    callback.accept(null);
-                });
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
     }
 
-    public void dispose() {
-        disposable.dispose();
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 81f77107e..8185a7437 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -2,7 +2,6 @@ package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
 import android.icu.text.SimpleDateFormat
-import android.util.Log
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -17,6 +16,10 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
+import okhttp3.Credentials
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Date
@@ -44,84 +47,99 @@ class ShareRepository(private val applicationContext: Context, private val accou
         searchString: String,
         page: Int,
         perPage: Int
-    ): Single<ArrayList<JSONObject>> {
-        return try {
-            Single.fromCallable {
-                val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-                val call = shareAPI.getSharees(search = searchString, page = page, perPage = perPage)
-                val response = call.execute()
+    ): ArrayList<JSONObject> {
+        val url = HttpUrl.Builder()
+            .scheme("http")
+            .host("10.0.2.2")
+            .port(55001)
+            .addPathSegments("ocs/v2.php/apps/files_sharing/api/v1/sharees")
+            .addQueryParameter("format", "json")
+            .addQueryParameter("itemType", "file")
+            .addQueryParameter("search", searchString)
+            .addQueryParameter("page", page.toString())
+            .addQueryParameter("perPage", perPage.toString())
+            .addQueryParameter("lookup", "false")
+            .build()
 
-                if (response.isSuccessful) {
-                    val respJSON = JSONObject(response.body().toString())
-                    val respOCS = respJSON.getJSONObject("ocs")
-                    val respData = respOCS.getJSONObject("data")
-                    val respExact = respData.getJSONObject("exact")
-                    val respExactUsers = respExact.getJSONArray("users")
-                    val respExactGroups = respExact.getJSONArray("groups")
-                    val respExactRemotes = respExact.getJSONArray("remotes")
-                    val respExactCircles = if (respExact.has("circles")) {
-                        respExact.getJSONArray("circles")
-                    } else {
-                        JSONArray()
-                    }
-                    val respExactRooms = if (respExact.has("rooms")) {
-                        respExact.getJSONArray("rooms")
-                    } else {
-                        JSONArray()
-                    }
+        val credentials = Credentials.basic("admin", "admin")
 
-                    val respExactEmails = respExact.getJSONArray("emails")
-                    val respPartialUsers = respData.getJSONArray("users")
-                    val respPartialGroups = respData.getJSONArray("groups")
-                    val respPartialRemotes = respData.getJSONArray("remotes")
-                    val respPartialCircles = if (respData.has("circles")) {
-                        respData.getJSONArray("circles")
-                    } else {
-                        JSONArray()
-                    }
-                    val respPartialRooms = if (respData.has("rooms")) {
-                        respData.getJSONArray("rooms")
-                    } else {
-                        JSONArray()
-                    }
+        val request = Request.Builder()
+            .url(url)
+            .header("OCS-APIRequest", "true")
+            .header("Accept", "application/json")
+            .header("Authorization", credentials)
+            .get()
+            .build()
 
-                    val jsonResults = arrayOf(
-                        respExactUsers,
-                        respExactGroups,
-                        respExactRemotes,
-                        respExactRooms,
-                        respExactEmails,
-                        respExactCircles,
-                        respPartialUsers,
-                        respPartialGroups,
-                        respPartialRemotes,
-                        respPartialRooms,
-                        respPartialCircles
-                    )
-                    val data: ArrayList<JSONObject> = ArrayList()
-                    val var25 = jsonResults
-                    val var26 = jsonResults.size
+        val client = OkHttpClient()
+        val call = client.newCall(request).execute()
 
-                    for (var27 in 0 until var26) {
-                        val jsonResult = var25[var27]
 
-                        for (j in 0 until jsonResult.length()) {
-                            val jsonObject = jsonResult.getJSONObject(j)
-                            data.add(jsonObject)
-                        }
-                    }
-                    data
-                } else {
-                    Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
-                    ArrayList()
-                }
-            }.subscribeOn(Schedulers.io())
-        } catch (e: Exception) {
-            Log_OC.d(tag, "Exception while get sharees", e)
+        //val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        //val call = shareAPI.getSharees(search = searchString, page = page.toString(), perPage = perPage.toString())
+        if (call.isSuccessful) {
+            val response = call.body.string()
+            val respJSON = JSONObject(response)
+            val respOCS = respJSON.getJSONObject("ocs")
+            val respData = respOCS.getJSONObject("data")
+            val respExact = respData.getJSONObject("exact")
+            val respExactUsers = respExact.getJSONArray("users")
+            val respExactGroups = respExact.getJSONArray("groups")
+            val respExactRemotes = respExact.getJSONArray("remotes")
+            val respExactCircles = if (respExact.has("circles")) {
+                respExact.getJSONArray("circles")
+            } else {
+                JSONArray()
+            }
+            val respExactRooms = if (respExact.has("rooms")) {
+                respExact.getJSONArray("rooms")
+            } else {
+                JSONArray()
+            }
 
-            Single.fromCallable {
-                ArrayList()
+            val respExactEmails = respExact.getJSONArray("emails")
+            val respPartialUsers = respData.getJSONArray("users")
+            val respPartialGroups = respData.getJSONArray("groups")
+            val respPartialRemotes = respData.getJSONArray("remotes")
+            val respPartialCircles = if (respData.has("circles")) {
+                respData.getJSONArray("circles")
+            } else {
+                JSONArray()
             }
+            val respPartialRooms = if (respData.has("rooms")) {
+                respData.getJSONArray("rooms")
+            } else {
+                JSONArray()
+            }
+
+            val jsonResults = arrayOf(
+                respExactUsers,
+                respExactGroups,
+                respExactRemotes,
+                respExactRooms,
+                respExactEmails,
+                respExactCircles,
+                respPartialUsers,
+                respPartialGroups,
+                respPartialRemotes,
+                respPartialRooms,
+                respPartialCircles
+            )
+            val data: ArrayList<JSONObject> = ArrayList()
+            val var25 = jsonResults
+            val var26 = jsonResults.size
+
+            for (var27 in 0 until var26) {
+                val jsonResult = var25[var27]
+
+                for (j in 0 until jsonResult.length()) {
+                    val jsonObject = jsonResult.getJSONObject(j)
+                    data.add(jsonObject)
+                }
+            }
+            return data
+        } else {
+            return ArrayList()
         }
     }
 
@@ -284,7 +302,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         permissions: Int? = null,
     ): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val requestBody = UpdateSharePermissionRequest(permissions = permissions,)
+        val requestBody = UpdateSharePermissionRequest(permissions = permissions)
 
         return try {
             val call = shareAPI.updateSharePermission(shareId, requestBody)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 754b001e7..739130785 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,7 +39,7 @@
     <string name="change_category_title">Choose a category</string>
 
     <!-- UsersAndGroupsSearchProvider -->
-    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
     <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
 
     <!-- QuickSharingPermissionsBottomSheetDialog -->

From a4644a15bf08b646e809311307d4f37d3f7a5e79 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 15:30:00 +0100
Subject: [PATCH 041/138] fix UsersAndGroupsSearchProvider

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |   7 -
 .../notes/share/NoteShareActivity.java        |   8 +-
 .../notes/share/adapter/SuggestionAdapter.kt  |  17 +--
 .../helper/UsersAndGroupsSearchProvider.java  | 132 ++++++------------
 app/src/main/res/values/strings.xml           |   2 +-
 5 files changed, 54 insertions(+), 112 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73a442da6..6a43f4dba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -192,12 +192,5 @@
             </intent-filter>
         </service>
 
-        <provider
-            android:name=".share.helper.UsersAndGroupsSearchProvider"
-            android:authorities="@string/users_and_groups_search_authority"
-            android:enabled="true"
-            android:exported="false"
-            android:label="@string/note_share_activity_search_text" />
-
     </application>
 </manifest>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 562810172..3dadea1fd 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -170,7 +170,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
         }
 
         SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
-        // UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
+        UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
         binding.searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
@@ -185,8 +185,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             binding.searchView.setQuery("", false);
         });
 
-        /*
-          binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+        binding.searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 // return true to prevent the query from being processed;
@@ -228,8 +227,6 @@ public boolean onQueryTextChange(String newText) {
                 return false;
             }
         });
-         */
-
 
         binding.searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
             @Override
@@ -247,7 +244,6 @@ public boolean onSuggestionClick(int position) {
                     String shareWith = cursor.getString(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_WITH));
                     int shareType = cursor.getInt(cursor.getColumnIndexOrThrow(UsersAndGroupsSearchProvider.SHARE_TYPE));
                     navigateNoteShareDetail(shareWith, shareType);
-                    // provider.dispose();
                 }
                 return true;
             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
index 7f23d59b1..50a3c0fa2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
@@ -3,7 +3,6 @@ package it.niedermann.owncloud.notes.share.adapter
 import android.app.SearchManager
 import android.content.Context
 import android.database.Cursor
-import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,7 +19,8 @@ class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(conte
     }
 
     override fun bindView(view: View, context: Context, cursor: Cursor) {
-        val suggestion = cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
+        val suggestion =
+            cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
         view.findViewById<TextView>(R.id.suggestion_text).text = suggestion
 
 
@@ -31,12 +31,13 @@ class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(conte
             try {
                 val iconId = cursor.getInt(iconColumn)
                 icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
-            } catch (e: NumberFormatException) {
-                val iconURIAsString = cursor.getString(iconColumn)
-                if (!iconURIAsString.isNullOrEmpty()) {
-                    val iconURI = Uri.parse(iconURIAsString)
-                    icon.setImageURI(iconURI)
-                }
+            } catch (e: Exception) {
+                icon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.ic_account_circle_grey_24dp
+                    )
+                )
             }
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 6a0f50fda..e1af38d07 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -7,8 +7,6 @@
 import static com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation.PROPERTY_STATUS;
 
 import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
@@ -18,8 +16,9 @@
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
+import com.nextcloud.android.sso.helper.SingleAccountHelper;
+import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -33,7 +32,10 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Consumer;
 
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
@@ -41,7 +43,7 @@
 /**
  * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
  */
-public class UsersAndGroupsSearchProvider extends ContentProvider {
+public class UsersAndGroupsSearchProvider {
 
     private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
 
@@ -67,18 +69,41 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     public static final String CONTENT = "content";
 
-    private String AUTHORITY;
-    private String DATA_USER;
-    private String DATA_GROUP;
-    private String DATA_ROOM;
-    private String DATA_REMOTE;
-    private String DATA_EMAIL;
-    private String DATA_CIRCLE;
+    private final String AUTHORITY;
+    private final String DATA_USER;
+    private final String DATA_GROUP;
+    private final String DATA_ROOM;
+    private final String DATA_REMOTE;
+    private final String DATA_EMAIL;
+    private final String DATA_CIRCLE;
 
-    private ShareRepository repository;
-    private Context context;
-    private UriMatcher mUriMatcher;
+    private final ShareRepository repository;
+    private final Context context;
+    private Disposable disposable;
 
+    public UsersAndGroupsSearchProvider(Context context, ShareRepository repository) {
+        this.context = context;
+        this.repository = repository;
+
+        AUTHORITY = context.getString(R.string.users_and_groups_search_provider_authority);
+        setActionShareWith(context);
+        DATA_USER = AUTHORITY + ".data.user";
+        DATA_GROUP = AUTHORITY + ".data.group";
+        DATA_ROOM = AUTHORITY + ".data.room";
+        DATA_REMOTE = AUTHORITY + ".data.remote";
+        DATA_EMAIL = AUTHORITY + ".data.email";
+        DATA_CIRCLE = AUTHORITY + ".data.circle";
+
+        sShareTypes.put(DATA_USER, ShareType.USER);
+        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
+        sShareTypes.put(DATA_ROOM, ShareType.ROOM);
+        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
+        sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
+        sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
+
+        UriMatcher mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
+    }
 
     private static final Map<String, ShareType> sShareTypes = new HashMap<>();
 
@@ -86,12 +111,7 @@ private static void setActionShareWith(@NonNull Context context) {
         ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
     }
 
-    public Cursor searchForUsersOrGroups(Uri uri) throws JSONException {
-        String lastPathSegment = uri.getLastPathSegment();
-        if (lastPathSegment == null) {
-            throw new IllegalArgumentException("Wrong URI passed!");
-        }
-        String userQuery = lastPathSegment.toLowerCase(Locale.ROOT);
+    public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback) throws JSONException {
         final var names = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE);
         MatrixCursor response = null;
         if (!names.isEmpty()) {
@@ -137,7 +157,7 @@ public Cursor searchForUsersOrGroups(Uri uri) throws JSONException {
                 if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
                     // skip all types but users, as E2E secure share is only allowed to users on same server
                     // TODO: CHECK SKIP LOGIC
-                    continue;
+                    //  continue;
                 }
 
                 switch (type) {
@@ -217,78 +237,10 @@ public Cursor searchForUsersOrGroups(Uri uri) throws JSONException {
                             .add(SHARE_WITH, shareWith)
                             .add(SHARE_TYPE, type.getValue());
                 }
-            }
 
-            return response;
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean onCreate() {
-        if (getContext() == null) {
-            return false;
-        }
-
-        AUTHORITY = context.getString(R.string.users_and_groups_search_authority);
-        setActionShareWith(context);
-        DATA_USER = AUTHORITY + ".data.user";
-        DATA_GROUP = AUTHORITY + ".data.group";
-        DATA_ROOM = AUTHORITY + ".data.room";
-        DATA_REMOTE = AUTHORITY + ".data.remote";
-        DATA_EMAIL = AUTHORITY + ".data.email";
-        DATA_CIRCLE = AUTHORITY + ".data.circle";
-
-        sShareTypes.put(DATA_USER, ShareType.USER);
-        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
-        sShareTypes.put(DATA_ROOM, ShareType.ROOM);
-        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
-        sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
-        sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
-
-        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
-
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
-        Log_OC.d(TAG, "query received in thread " + Thread.currentThread().getName());
-
-        int match = mUriMatcher.match(uri);
-        if (match == SEARCH) {
-            try {
-                return searchForUsersOrGroups(uri);
-            } catch (JSONException e) {
-                return null;
             }
         }
 
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull Uri uri) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
-        return null;
-    }
-
-    @Override
-    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
-        return 0;
-    }
-
-    @Override
-    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
-        return 0;
+        callback.accept(response);
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 739130785..754b001e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,7 +39,7 @@
     <string name="change_category_title">Choose a category</string>
 
     <!-- UsersAndGroupsSearchProvider -->
-    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
     <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
 
     <!-- QuickSharingPermissionsBottomSheetDialog -->

From 30344aca78de03cd45135c06dfaf89055d7460f4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 31 Jan 2025 17:06:12 +0100
Subject: [PATCH 042/138] fix getSharees

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |   4 +-
 .../notes/share/repository/ShareRepository.kt | 105 +++++-------------
 2 files changed, 29 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 401cc13f7..db8493ca0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -1,5 +1,6 @@
 package it.niedermann.owncloud.notes.persistence.sync
 
+import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.api.EmptyResponse
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
@@ -8,7 +9,6 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
-import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.Body
@@ -28,7 +28,7 @@ interface ShareAPI {
         @Query("page") page: String,
         @Query("perPage") perPage: String,
         @Query("lookup") lookup: String = "false",
-    ): Response<ResponseBody>
+    ): LinkedTreeMap<String, Any?>?
 
     @GET("shares")
     fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 8185a7437..767296e82 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -2,6 +2,8 @@ package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
 import android.icu.text.SimpleDateFormat
+import com.google.gson.Gson
+import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -16,11 +18,6 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
-import okhttp3.Credentials
-import okhttp3.HttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Date
 import java.util.Locale
@@ -48,71 +45,29 @@ class ShareRepository(private val applicationContext: Context, private val accou
         page: Int,
         perPage: Int
     ): ArrayList<JSONObject> {
-        val url = HttpUrl.Builder()
-            .scheme("http")
-            .host("10.0.2.2")
-            .port(55001)
-            .addPathSegments("ocs/v2.php/apps/files_sharing/api/v1/sharees")
-            .addQueryParameter("format", "json")
-            .addQueryParameter("itemType", "file")
-            .addQueryParameter("search", searchString)
-            .addQueryParameter("page", page.toString())
-            .addQueryParameter("perPage", perPage.toString())
-            .addQueryParameter("lookup", "false")
-            .build()
-
-        val credentials = Credentials.basic("admin", "admin")
-
-        val request = Request.Builder()
-            .url(url)
-            .header("OCS-APIRequest", "true")
-            .header("Accept", "application/json")
-            .header("Authorization", credentials)
-            .get()
-            .build()
-
-        val client = OkHttpClient()
-        val call = client.newCall(request).execute()
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.getSharees(search = searchString, page = page.toString(), perPage = perPage.toString())
+        return if (call != null) {
+            val respOCS = call["ocs"] as? LinkedTreeMap<*, *>
+            val respData = respOCS?.get("data") as? LinkedTreeMap<*, *>
+            val respExact = respData?.get("exact") as? LinkedTreeMap<*, *>
 
+            fun LinkedTreeMap<*, *>.getList(key: String): ArrayList<*>? = this[key] as? ArrayList<*>
 
-        //val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        //val call = shareAPI.getSharees(search = searchString, page = page.toString(), perPage = perPage.toString())
-        if (call.isSuccessful) {
-            val response = call.body.string()
-            val respJSON = JSONObject(response)
-            val respOCS = respJSON.getJSONObject("ocs")
-            val respData = respOCS.getJSONObject("data")
-            val respExact = respData.getJSONObject("exact")
-            val respExactUsers = respExact.getJSONArray("users")
-            val respExactGroups = respExact.getJSONArray("groups")
-            val respExactRemotes = respExact.getJSONArray("remotes")
-            val respExactCircles = if (respExact.has("circles")) {
-                respExact.getJSONArray("circles")
-            } else {
-                JSONArray()
-            }
-            val respExactRooms = if (respExact.has("rooms")) {
-                respExact.getJSONArray("rooms")
-            } else {
-                JSONArray()
-            }
+            val respExactUsers = respExact?.getList("users")
+            val respExactGroups = respExact?.getList("groups")
+            val respExactRemotes = respExact?.getList("remotes")
+            val respExactEmails = respExact?.getList("emails")
+            val respExactCircles = respExact?.takeIf { it.containsKey("circles") }?.getList("circles")
+            val respExactRooms = respExact?.takeIf { it.containsKey("rooms") }?.getList("rooms")
 
-            val respExactEmails = respExact.getJSONArray("emails")
-            val respPartialUsers = respData.getJSONArray("users")
-            val respPartialGroups = respData.getJSONArray("groups")
-            val respPartialRemotes = respData.getJSONArray("remotes")
-            val respPartialCircles = if (respData.has("circles")) {
-                respData.getJSONArray("circles")
-            } else {
-                JSONArray()
-            }
-            val respPartialRooms = if (respData.has("rooms")) {
-                respData.getJSONArray("rooms")
-            } else {
-                JSONArray()
-            }
+            val respPartialUsers = respData?.getList("users")
+            val respPartialGroups = respData?.getList("groups")
+            val respPartialRemotes = respData?.getList("remotes")
+            val respPartialCircles = respData?.takeIf { it.containsKey("circles") }?.getList("circles")
+            val respPartialRooms = respData?.takeIf { it.containsKey("rooms") }?.getList("rooms")
 
-            val jsonResults = arrayOf(
+            val jsonResults = listOfNotNull(
                 respExactUsers,
                 respExactGroups,
                 respExactRemotes,
@@ -125,21 +80,15 @@ class ShareRepository(private val applicationContext: Context, private val accou
                 respPartialRooms,
                 respPartialCircles
             )
-            val data: ArrayList<JSONObject> = ArrayList()
-            val var25 = jsonResults
-            val var26 = jsonResults.size
-
-            for (var27 in 0 until var26) {
-                val jsonResult = var25[var27]
 
-                for (j in 0 until jsonResult.length()) {
-                    val jsonObject = jsonResult.getJSONObject(j)
-                    data.add(jsonObject)
+            val gson = Gson()
+            return jsonResults.flatMap { jsonResult ->
+                jsonResult.map { linkedTreeMap ->
+                    JSONObject(gson.toJson(linkedTreeMap))
                 }
-            }
-            return data
+            }.toCollection(ArrayList())
         } else {
-            return ArrayList()
+            ArrayList()
         }
     }
 

From 9920b40698e66fbe7967a278c0aece2b35633b46 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 08:52:46 +0100
Subject: [PATCH 043/138] fix add

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index db8493ca0..49bafca8f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -46,7 +46,7 @@ interface ShareAPI {
     @PATCH("shares")
     fun updateShare(@Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
-    @POST("shares")
+    @POST("shares?format=json")
     fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
     @PATCH("shares/{shareId}")

From 1f505d39f4d1d3afaaef0c8da78664cf0ed0c486 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 14:07:51 +0100
Subject: [PATCH 044/138] add getShares

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        | 16 +++++--
 .../notes/share/NoteShareActivity.java        |  5 +-
 .../notes/share/model/CreateShareResponse.kt  |  3 ++
 .../model/CreateShareResponseExtensions.kt    | 36 ++++++++++++++
 .../notes/share/repository/ShareRepository.kt | 47 +++++++++++++++----
 5 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 49bafca8f..82b273b2b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -2,6 +2,7 @@ package it.niedermann.owncloud.notes.persistence.sync
 
 import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.api.EmptyResponse
+import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
@@ -10,7 +11,6 @@ import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import retrofit2.Call
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -30,8 +30,18 @@ interface ShareAPI {
         @Query("lookup") lookup: String = "false",
     ): LinkedTreeMap<String, Any?>?
 
-    @GET("shares")
-    fun getShares(remoteId: Long): Call<OcsResponse<List<OCShare>>>
+    @GET("shares/{remoteId}?format=json")
+    fun getShares(
+        @Path("remoteId") remoteId: Long,
+        @Query("include_tags") includeTags: Boolean = true,
+    ): Call<OcsResponse<List<CreateShareResponse>>>
+
+    @GET("shares?format=json")
+    fun getSharesForNote(
+        @Query("path") path: String,
+        @Query("reshares") reshares: Boolean,
+        @Query("subfiles") subfiles: Boolean,
+    ): RemoteOperation<List<OCShare>>
 
     @GET("shares")
     fun getSharesForFile(
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 3dadea1fd..7bd78391f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -113,8 +113,11 @@ private void initializeArguments() {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
 
+                // TODO: Used saved ids
+                final var shares = repository.getShares(note);
+
                 runOnUiThread(() -> {
-                    binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
+                    binding.sharesList.setAdapter(new ShareeListAdapter(this, shares, this, account));
                     binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
                     binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
                     binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
index 7a95c68e8..1d39649e3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
@@ -119,4 +119,7 @@ data class CreateShareResponse(
     @Expose
     @SerializedName("hide_download")
     val hideDownload: Long,
+
+    @Expose
+    val attributes: Any?,
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
new file mode 100644
index 000000000..23cc39595
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -0,0 +1,36 @@
+package it.niedermann.owncloud.notes.share.model
+
+import com.owncloud.android.lib.resources.shares.OCShare
+import com.owncloud.android.lib.resources.shares.ShareType
+
+fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
+    return map { response ->
+        OCShare().apply {
+            id = response.id.toLongOrNull() ?: 0
+            fileSource = response.fileSource
+            itemSource = response.itemSource
+            shareType = when (response.shareType) {
+                0L -> ShareType.USER
+                1L -> ShareType.GROUP
+                3L -> ShareType.PUBLIC_LINK
+                else -> null
+            }
+            shareWith = response.shareWith
+            path = response.path
+            permissions = response.permissions.toInt()
+            sharedDate = response.stime
+            token = null
+            sharedWithDisplayName = response.shareWithDisplayname
+            isFolder = response.itemType == "folder"
+            userId = response.uidOwner
+            shareLink = null
+            isPasswordProtected = false
+            note = response.note
+            isHideFileDownload = response.hideDownload > 0
+            label = response.label
+            isHasPreview = response.hasPreview
+            mimetype = response.mimetype
+            ownerDisplayName = response.displaynameOwner
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 767296e82..aaae11f52 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -2,21 +2,26 @@ package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
 import android.icu.text.SimpleDateFormat
+import android.net.Uri
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
+import com.owncloud.android.lib.resources.shares.ShareToRemoteOperationResultParser
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.lib.resources.shares.ShareXMLParser
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
+import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
+import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import org.json.JSONObject
 import java.util.Date
@@ -93,14 +98,40 @@ class ShareRepository(private val applicationContext: Context, private val accou
     }
 
     fun getShares(
-        remoteId: Long
-    ): Single<List<OCShare>> {
-        return Single.fromCallable {
-            val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-            val call = shareAPI.getShares(remoteId)
-            val response = call.execute()
-            response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
-        }.subscribeOn(Schedulers.io())
+        note: Note
+    ): List<OCShare>? {
+        /*
+         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
+        val notesPathResponse = notesPathCall.execute()
+        val notesPathResponseResult = notesPathResponse.body() ?: return null
+        val notesPath = notesPathResponseResult.notesPath
+        val notesSuffix = notesPathResponseResult.fileSuffix
+        val remotePath =  "/" + notesPath + "/" + note.title + notesSuffix
+
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.getSharesForNote(remotePath, true, true)
+
+
+
+        return  null
+
+         */
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.getShares(12)
+        val response = call.execute()
+
+        return try {
+            if (response.isSuccessful) {
+                val result = response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+                result.toOCShare()
+            } else {
+                Log_OC.d(tag, "Failed to getShares: ${response.errorBody()?.string()}")
+                null
+            }
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while getShares: $e")
+            null
+        }
     }
 
     fun getSharesForFile(

From 98b544655ad40d6ab621647b675ede813bf2deed Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 14:53:56 +0100
Subject: [PATCH 045/138] add fetch and save logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/NotesDatabase.java      |  9 ++++-
 .../notes/persistence/NotesRepository.java    |  9 +++++
 .../notes/persistence/dao/ShareDao.kt         | 16 ++++++++
 .../notes/persistence/entity/ShareEntity.kt   | 14 +++++++
 .../notes/share/NoteShareActivity.java        | 14 ++++++-
 .../notes/share/NoteShareDetailActivity.kt    | 37 +++++++++++++------
 .../notes/share/repository/ShareRepository.kt | 27 +++++++++-----
 7 files changed, 102 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
index 72507d588..e8f5570ef 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
@@ -19,6 +19,7 @@
 import it.niedermann.owncloud.notes.persistence.dao.AccountDao;
 import it.niedermann.owncloud.notes.persistence.dao.CategoryOptionsDao;
 import it.niedermann.owncloud.notes.persistence.dao.NoteDao;
+import it.niedermann.owncloud.notes.persistence.dao.ShareDao;
 import it.niedermann.owncloud.notes.persistence.dao.WidgetNotesListDao;
 import it.niedermann.owncloud.notes.persistence.dao.WidgetSingleNoteDao;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
@@ -26,6 +27,7 @@
 import it.niedermann.owncloud.notes.persistence.entity.Converters;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.persistence.entity.SingleNoteWidgetData;
 import it.niedermann.owncloud.notes.persistence.migration.Migration_10_11;
 import it.niedermann.owncloud.notes.persistence.migration.Migration_11_12;
@@ -50,8 +52,9 @@
                 Note.class,
                 CategoryOptions.class,
                 SingleNoteWidgetData.class,
-                NotesListWidgetData.class
-        }, version = 25
+                NotesListWidgetData.class,
+                ShareEntity.class
+        }, version = 26
 )
 @TypeConverters({Converters.class})
 public abstract class NotesDatabase extends RoomDatabase {
@@ -115,4 +118,6 @@ public void onCreate(@NonNull SupportSQLiteDatabase db) {
     public abstract WidgetSingleNoteDao getWidgetSingleNoteDao();
 
     public abstract WidgetNotesListDao getWidgetNotesListDao();
+
+    public abstract ShareDao getShareDao();
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 0ad24f3d1..33aafc0d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -60,6 +60,7 @@
 import it.niedermann.owncloud.notes.persistence.entity.CategoryWithNotesCount;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.persistence.entity.SingleNoteWidgetData;
 import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -959,4 +960,12 @@ public Call<NotesSettings> putServerSettings(@NonNull SingleSignOnAccount ssoAcc
     public void updateDisplayName(long id, @Nullable String displayName) {
         db.getAccountDao().updateDisplayName(id, displayName);
     }
+
+    public void addShareEntity(ShareEntity entity) {
+        db.getShareDao().addShareEntity(entity);
+    }
+
+    public List<ShareEntity> getShareEntities(long noteRemoteId, String userName) {
+        return db.getShareDao().getShareEntities(noteRemoteId, userName);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
new file mode 100644
index 000000000..9e8d68119
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -0,0 +1,16 @@
+package it.niedermann.owncloud.notes.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
+
+@Dao
+interface ShareDao {
+
+    @Insert
+    fun addShareEntity(entity: ShareEntity)
+
+    @Query("SELECT * FROM share_table WHERE id = :noteRemoteId AND userName = :userName")
+    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
new file mode 100644
index 000000000..8e05c5a9f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
@@ -0,0 +1,14 @@
+package it.niedermann.owncloud.notes.persistence.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "share_table")
+data class ShareEntity(
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    val id: Int? = null,
+    val noteRemoteId: Long,
+    val userName: String
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 7bd78391f..e4e7faeb6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -43,6 +43,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
@@ -52,6 +53,7 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
 import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
@@ -114,7 +116,17 @@ private void initializeArguments() {
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
 
                 // TODO: Used saved ids
-                final var shares = repository.getShares(note);
+                final var shares = new ArrayList<OCShare>();
+
+                if (note != null && note.getRemoteId() != null) {
+                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
+                    shareEntities.forEach(entity -> {
+                        final var share = repository.getShares(entity.getNoteRemoteId());
+                        if (share != null) {
+                            shares.addAll(share);
+                        }
+                    });
+                }
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, shares, this, account));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index d2b46b286..e4fbd8f04 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -15,6 +15,7 @@ import it.niedermann.owncloud.notes.branding.BrandedActivity
 import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
 import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
@@ -523,15 +524,16 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         lifecycleScope.launch(Dispatchers.IO) {
             // if modifying existing share then directly update the note and send email
-            val result = if (share != null && share?.note != noteText) {
-                repository.updateShare(share!!.id, noteText)
+            if (share != null && share?.note != noteText) {
+                val result = repository.updateShare(share!!.id, noteText)
+                handleResult(result)
             } else {
                 if (note == null || shareeName == null) {
                     Log_OC.d(TAG, "validateShareProcessSecond cancelled")
                     return@launch
                 }
 
-                repository.addShare(
+                val result = repository.addShare(
                     note!!,
                     shareType,
                     shareeName!!,
@@ -540,17 +542,28 @@ class NoteShareDetailActivity : BrandedActivity(),
                     permission,
                     noteText
                 )
-            }
 
-            withContext(Dispatchers.Main) {
-                if (result) {
-                    finish()
-                } else {
-                    DisplayUtils.showSnackMessage(
-                        this@NoteShareDetailActivity,
-                        getString(R.string.note_share_detail_activity_create_share_error)
-                    )
+                if (result != null) {
+                    val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+                    val entity = ShareEntity(result.id.toInt(), note?.remoteId!!, ssoAcc.name)
+                    repository.addShareEntity(entity)
                 }
+
+                handleResult(result != null)
+            }
+        }
+    }
+
+    private suspend fun handleResult(success: Boolean) {
+        withContext(Dispatchers.Main) {
+            if (success) {
+                finish()
+            } else {
+
+                DisplayUtils.showSnackMessage(
+                    this@NoteShareDetailActivity,
+                    getString(R.string.note_share_detail_activity_create_share_error)
+                )
             }
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index aaae11f52..92ba51383 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -16,6 +16,7 @@ import io.reactivex.schedulers.Schedulers
 import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
@@ -23,6 +24,8 @@ import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import java.util.Date
 import java.util.Locale
@@ -37,6 +40,14 @@ class ShareRepository(private val applicationContext: Context, private val accou
         )
     }
 
+    suspend fun addShareEntity(entity: ShareEntity) = withContext(Dispatchers.IO) {
+        notesRepository.addShareEntity(entity)
+    }
+
+    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity> {
+        return notesRepository.getShareEntities(noteRemoteId, userName)
+    }
+
     private fun getNotesPath(): Single<String> {
         return Single.fromCallable {
             val call = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
@@ -97,9 +108,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    fun getShares(
-        note: Note
-    ): List<OCShare>? {
+    fun getShares(remoteId: Long): List<OCShare>? {
         /*
          val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
@@ -117,7 +126,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
 
          */
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val call = shareAPI.getShares(12)
+        val call = shareAPI.getShares(remoteId)
         val response = call.execute()
 
         return try {
@@ -201,10 +210,10 @@ class ShareRepository(private val applicationContext: Context, private val accou
         password: String = "",
         permissions: Int = 0,
         shareNote: String = ""
-    ): Boolean {
+    ): CreateShareResponse? {
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return false
+        val notesPathResponseResult = notesPathResponse.body() ?: return null
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
 
@@ -221,15 +230,15 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.addShare(request = requestBody)
         val response = call.execute()
-        if (response.isSuccessful) {
+        return if (response.isSuccessful) {
             val createShareResponse = response.body()
             Log_OC.d(tag, "Response successful: $createShareResponse")
+            createShareResponse?.ocs?.data
         } else {
             val errorBody = response.errorBody()?.string()
             Log_OC.d(tag, "Response failed:$errorBody")
+            null
         }
-
-        return response.isSuccessful
     }
 
     fun updateShareInformation(

From 9694a65664aa6e121bdb059cc7c7cc5802e34428 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 15:21:40 +0100
Subject: [PATCH 046/138] fix build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/dao/ShareDao.kt         |  2 +-
 .../notes/share/NoteShareActivity.java        | 88 +++++++++----------
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 9e8d68119..97f27cac0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -11,6 +11,6 @@ interface ShareDao {
     @Insert
     fun addShareEntity(entity: ShareEntity)
 
-    @Query("SELECT * FROM share_table WHERE id = :noteRemoteId AND userName = :userName")
+    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
     fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e4e7faeb6..25408bd48 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -30,6 +30,8 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
+import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -115,21 +117,8 @@ private void initializeArguments() {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
 
-                // TODO: Used saved ids
-                final var shares = new ArrayList<OCShare>();
-
-                if (note != null && note.getRemoteId() != null) {
-                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
-                    shareEntities.forEach(entity -> {
-                        final var share = repository.getShares(entity.getNoteRemoteId());
-                        if (share != null) {
-                            shares.addAll(share);
-                        }
-                    });
-                }
-
                 runOnUiThread(() -> {
-                    binding.sharesList.setAdapter(new ShareeListAdapter(this, shares, this, account));
+                    binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
                     binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
                     binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
                     binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
@@ -512,46 +501,53 @@ public void refreshCapabilitiesFromDB() {
      * before reading database.
      */
     public void refreshSharesFromDB() {
-        /*
-        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
-        if (newFile != null) {
-            file = newFile;
-        }
+        new Thread(() -> {
+            try {
+                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
+                ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+                if (adapter == null) {
+                    runOnUiThread(() -> DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.could_not_retrieve_shares)));
+                    return;
+                }
 
-        if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
-                    .show();
-            return;
-        }
-        adapter.getShares().clear();
+                adapter.getShares().clear();
 
-        // to show share with users/groups info
-        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
-                user.getAccountName());
+                // to show share with users/groups info
+                List<OCShare> shares = new ArrayList<>();
 
-        adapter.addShares(shares);
+                if (note != null && note.getRemoteId() != null) {
+                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
+                    shareEntities.forEach(entity -> {
+                        if (entity.getId() != null) {
+                            final var share = repository.getShares(entity.getId());
+                            if (share != null) {
+                                shares.addAll(share);
+                            }
+                        }
+                    });
+                }
 
-        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
-            return;
-        }
+                runOnUiThread(() -> {
+                    adapter.addShares(shares);
 
-        // Get public share
-        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
-                ShareType.PUBLIC_LINK,
-                "");
+                    // TODO: Will be added later on...
+                    List<OCShare> publicShares = new ArrayList<>();
 
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
-            final OCShare ocShare = new OCShare();
-            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-            publicShares.add(ocShare);
-        } else {
-            adapter.removeNewPublicShare();
-        }
+                    if (containsNoNewPublicShare(adapter.getShares())) {
+                        final OCShare ocShare = new OCShare();
+                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+                        publicShares.add(ocShare);
+                    } else {
+                        adapter.removeNewPublicShare();
+                    }
 
-        adapter.addShares(publicShares);
-         */
+                    adapter.addShares(publicShares);
+                });
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }).start();
 
     }
 

From 848b2cab3431fdd223a084e1b8d3a05240416c5c Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 16:23:30 +0100
Subject: [PATCH 047/138] fix more action bottom sheet

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 30 ++++++++++++-------
 .../share/adapter/holder/ShareViewHolder.java |  6 ++--
 ...ils_sharing_menu_bottom_sheet_fragment.xml | 10 +++----
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 25408bd48..6a97c99d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -454,9 +454,6 @@ private void refreshUiFromDB() {
         setupView();
     }
 
-    private void unshareWith(OCShare share) {
-        repository.removeShare(share.getId());
-    }
 
     /**
      * Starts a dialog that requests a password to the user to protect a share link.
@@ -545,7 +542,7 @@ public void refreshSharesFromDB() {
                     adapter.addShares(publicShares);
                 });
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
             }
         }).start();
 
@@ -619,6 +616,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putSerializable(ARG_ACCOUNT, account);
     }
 
+    // TODO: capabilities needed
     private boolean isReshareForbidden(OCShare share) {
         return false;
         // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
@@ -643,13 +641,23 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        unshareWith(share);
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-        if (adapter == null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-            return;
-        }
-        adapter.remove(share);
+        new Thread(() -> {{
+            // TODO: FIXME
+            final var result = repository.removeShare(share.getId());
+
+            runOnUiThread(() -> {
+                if (result) {
+                    ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+                    if (adapter == null) {
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.email_pick_failed));
+                        return;
+                    }
+                    adapter.remove(share);
+                } else {
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
+                }
+            });
+        }}).start();
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index c9d1a8e7e..37388a116 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -42,7 +42,7 @@ public ShareViewHolder(ItemShareShareBinding binding,
 
     public void bind(OCShare share,
                      ShareeListAdapterListener listener) {
-        String userId = String.valueOf(account.getId());
+        String accountName = account.getDisplayName();
         String name = share.getSharedWithDisplayName();
         binding.icon.setTag(null);
 
@@ -66,7 +66,7 @@ public void bind(OCShare share,
                 binding.icon.setTag(share.getShareWith());
 
                 Glide.with(context)
-                        .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                        .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(share.getSharedWithDisplayName()) + "/64"))
                         .placeholder(R.drawable.ic_account_circle_grey_24dp)
                         .error(R.drawable.ic_account_circle_grey_24dp)
                         .apply(RequestOptions.circleCropTransform())
@@ -80,7 +80,7 @@ public void bind(OCShare share,
 
         binding.name.setText(name);
 
-        if (share.getShareWith().equalsIgnoreCase(userId) || share.getUserId().equalsIgnoreCase(userId)) {
+        if (accountName.equalsIgnoreCase(share.getShareWith()) || accountName.equalsIgnoreCase(share.getUserId())) {
             binding.overflowMenu.setVisibility(View.VISIBLE);
 
             String permissionName = SharingMenuHelper.getPermissionName(context, share);
diff --git a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
index f14b59c14..64f3d2604 100644
--- a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
@@ -36,7 +36,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@null"
             android:src="@drawable/ic_edit"
-            app:tint="@color/primary" />
+            app:tint="@color/defaultBrand" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@null"
             android:src="@drawable/ic_email"
-            app:tint="@color/primary" />
+            app:tint="@color/defaultBrand" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -102,7 +102,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@null"
             android:src="@drawable/ic_link"
-            app:tint="@color/primary" />
+            app:tint="@color/defaultBrand" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -134,7 +134,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@null"
             android:src="@drawable/ic_delete"
-            app:tint="@color/primary" />
+            app:tint="@color/defaultBrand" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -168,7 +168,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@null"
             android:src="@drawable/ic_plus"
-            app:tint="@color/primary" />
+            app:tint="@color/defaultBrand" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 754b001e7..b6341244b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@
     <string name="no_email_app_available">No App available to handle mail address</string>
     <string name="no_actions">No actions for this user</string>
 
+    <string name="failed_the_remove_share">Failed to remove share</string>
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>
     <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>

From fed14ffb08b492f61579594e812aa57e936dfc48 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 09:03:05 +0100
Subject: [PATCH 048/138] fix removeShare

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt | 4 ++--
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 82b273b2b..1fc4b734f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -50,8 +50,8 @@ interface ShareAPI {
         subfiles: Boolean
     ): Call<OcsResponse<MutableList<OCShare>>>
 
-    @DELETE("shares/{shareId}")
-    fun removeShare(@Path("shareId") shareId: Long): Call<EmptyResponse>
+    @DELETE("shares/{shareId}?format=json")
+    fun removeShare(@Path("shareId") shareId: Long): Call<Any>
 
     @PATCH("shares")
     fun updateShare(@Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 6a97c99d2..7abba4433 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -642,7 +642,6 @@ public void sendNewEmail(OCShare share) {
     @Override
     public void unShare(OCShare share) {
         new Thread(() -> {{
-            // TODO: FIXME
             final var result = repository.removeShare(share.getId());
 
             runOnUiThread(() -> {

From 5e02a856a26644505fd38e05c40752823f72e4ef Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 09:10:36 +0100
Subject: [PATCH 049/138] remove unused functionalities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        | 14 ----
 .../notes/share/NoteShareActivity.java        | 16 +---
 .../share/dialog/ProfileBottomSheetDialog.kt  |  7 +-
 .../helper/UsersAndGroupsSearchProvider.java  |  4 -
 .../listener/ShareeListAdapterListener.java   |  4 +-
 .../notes/share/operations/ClientFactory.java | 58 -------------
 .../share/operations/ClientFactoryImpl.java   | 84 -------------------
 .../RetrieveHoverCardAsyncTask.java           | 73 ----------------
 .../notes/share/repository/ShareRepository.kt | 49 -----------
 .../owncloud/notes/shared/server/Server.kt    | 40 ---------
 .../owncloud/notes/shared/user/User.kt        | 56 -------------
 11 files changed, 10 insertions(+), 395 deletions(-)
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 1fc4b734f..00e55dfa1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -36,20 +36,6 @@ interface ShareAPI {
         @Query("include_tags") includeTags: Boolean = true,
     ): Call<OcsResponse<List<CreateShareResponse>>>
 
-    @GET("shares?format=json")
-    fun getSharesForNote(
-        @Query("path") path: String,
-        @Query("reshares") reshares: Boolean,
-        @Query("subfiles") subfiles: Boolean,
-    ): RemoteOperation<List<OCShare>>
-
-    @GET("shares")
-    fun getSharesForFile(
-        remoteFilePath: String,
-        reshares: Boolean,
-        subfiles: Boolean
-    ): Call<OcsResponse<MutableList<OCShare>>>
-
     @DELETE("shares/{shareId}?format=json")
     fun removeShare(@Path("shareId") shareId: Long): Call<Any>
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 7abba4433..75ef8b924 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -30,14 +30,11 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
-import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
-import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,7 +42,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
@@ -55,7 +51,6 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
 import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
@@ -66,10 +61,7 @@
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
-import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
-import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
@@ -88,7 +80,6 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
-    private ClientFactoryImpl clientFactory;
     private ShareRepository repository;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -110,8 +101,6 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        clientFactory = new ClientFactoryImpl(this);
-
         new Thread(() -> {{
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
@@ -476,7 +465,9 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     }
 
     @Override
-    public void showProfileBottomSheet(User user, String shareWith) {
+    public void showProfileBottomSheet(Account account, String shareWith) {
+        // TODO:
+        /*
         if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
             new RetrieveHoverCardAsyncTask(user,
                     account,
@@ -484,6 +475,7 @@ public void showProfileBottomSheet(User user, String shareWith) {
                     this,
                     clientFactory).execute();
         }
+         */
     }
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
index c2f99ae30..5cf449263 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
@@ -1,7 +1,6 @@
 package it.niedermann.owncloud.notes.share.dialog
 
 
-import android.content.ActivityNotFoundException
 import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
@@ -21,7 +20,6 @@ import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetActionBinding
 import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetFragmentBinding
 import it.niedermann.owncloud.notes.persistence.entity.Account
-import it.niedermann.owncloud.notes.shared.user.User
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
 
 /**
@@ -29,7 +27,6 @@ import it.niedermann.owncloud.notes.shared.util.DisplayUtils
  */
 class ProfileBottomSheetDialog(
     private val fileActivity: FragmentActivity,
-    private val user: User,
     private val account: Account,
     private val hoverCard: HoverCard,
 ) : BottomSheetDialog(fileActivity) {
@@ -134,6 +131,8 @@ class ProfileBottomSheetDialog(
     }
 
     private fun openTalk(userId: String, hyperlink: String) {
+        // TODO:
+        /*
         try {
             val sharingIntent = Intent(Intent.ACTION_VIEW)
             sharingIntent.setClassName(
@@ -146,6 +145,8 @@ class ProfileBottomSheetDialog(
         } catch (e: ActivityNotFoundException) {
             openWebsite(hyperlink)
         }
+         */
+
     }
 
     override fun onStop() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index e1af38d07..9177be87e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -17,9 +17,6 @@
 
 import androidx.annotation.NonNull;
 
-import com.nextcloud.android.sso.helper.SingleAccountHelper;
-import com.nextcloud.android.sso.model.SingleSignOnAccount;
-import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.users.Status;
@@ -35,7 +32,6 @@
 import java.util.function.Consumer;
 
 import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
index 72d9737e4..c39d208f6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/ShareeListAdapterListener.java
@@ -2,7 +2,7 @@
 
 import com.owncloud.android.lib.resources.shares.OCShare;
 
-import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
 
 public interface ShareeListAdapterListener {
     void copyLink(OCShare share);
@@ -19,5 +19,5 @@ public interface ShareeListAdapterListener {
 
     void showPermissionsDialog(OCShare share);
 
-    void showProfileBottomSheet(User user, String shareWith);
+    void showProfileBottomSheet(Account account, String shareWith);
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
deleted file mode 100644
index 6b6db5748..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package it.niedermann.owncloud.notes.share.operations;
-
-
-import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.app.Activity;
-import android.net.Uri;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.PlainClient;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-
-import java.io.IOException;
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-public interface ClientFactory {
-
-    /**
-     * This exception wraps all possible errors thrown by trigger-happy OwnCloudClient constructor, making try-catch
-     * blocks manageable.
-     * <p>
-     * This is a temporary refactoring measure, until a better error handling method can be procured.
-     */
-    @Deprecated
-    class CreationException extends Exception {
-
-        private static final long serialVersionUID = 0L;
-
-        CreationException(Throwable t) {
-            super(t);
-        }
-    }
-
-    OwnCloudClient create(User user) throws CreationException;
-
-    NextcloudClient createNextcloudClient(User user) throws CreationException;
-
-    @Deprecated
-    OwnCloudClient create(Account account)
-            throws OperationCanceledException, AuthenticatorException, IOException,
-            AccountUtils.AccountNotFoundException;
-
-    @Deprecated
-    OwnCloudClient create(Account account, Activity currentActivity)
-            throws OperationCanceledException, AuthenticatorException, IOException,
-            AccountUtils.AccountNotFoundException;
-
-    OwnCloudClient create(Uri uri,
-                          boolean followRedirects,
-                          boolean useNextcloudUserAgent);
-
-    OwnCloudClient create(Uri uri, boolean followRedirects);
-
-    PlainClient createPlainClient();
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java
deleted file mode 100644
index b9c82d25e..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/ClientFactoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-
-package it.niedermann.owncloud.notes.share.operations;
-
-import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.PlainClient;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-
-import java.io.IOException;
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-public class ClientFactoryImpl implements ClientFactory {
-
-    private Context context;
-
-    public ClientFactoryImpl(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public OwnCloudClient create(User user) throws CreationException {
-        try {
-            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
-        } catch (OperationCanceledException |
-            AuthenticatorException |
-            IOException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public NextcloudClient createNextcloudClient(User user) throws CreationException {
-        try {
-            return OwnCloudClientFactory.createNextcloudClient(user, context);
-        } catch (AccountUtils.AccountNotFoundException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public OwnCloudClient create(Account account)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context);
-    }
-
-    @Override
-    public OwnCloudClient create(Account account, Activity currentActivity)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public PlainClient createPlainClient() {
-        return new PlainClient(context);
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
deleted file mode 100644
index b1bbde32f..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/operations/RetrieveHoverCardAsyncTask.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package it.niedermann.owncloud.notes.share.operations;
-
-
-import android.os.AsyncTask;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.Lifecycle;
-
-import com.nextcloud.android.lib.resources.profile.GetHoverCardRemoteOperation;
-import com.nextcloud.android.lib.resources.profile.HoverCard;
-import com.nextcloud.common.NextcloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-
-import java.lang.ref.WeakReference;
-
-import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.persistence.entity.Account;
-import it.niedermann.owncloud.notes.share.dialog.ProfileBottomSheetDialog;
-import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
-
-public class RetrieveHoverCardAsyncTask extends AsyncTask<Void, Void, HoverCard> {
-    private final User user;
-    private final Account account;
-    private final String userId;
-    private final WeakReference<FragmentActivity> activityWeakReference;
-    private final ClientFactory clientFactory;
-
-    public RetrieveHoverCardAsyncTask(User user,
-                                      Account account,
-                                      String userId,
-                                      FragmentActivity activity,
-                                      ClientFactory clientFactory) {
-        this.user = user;
-        this.account = account;
-        this.userId = userId;
-        this.activityWeakReference = new WeakReference<>(activity);
-        this.clientFactory = clientFactory;
-    }
-
-    @Override
-    protected HoverCard doInBackground(Void... voids) {
-        try {
-            NextcloudClient client = clientFactory.createNextcloudClient(user);
-            RemoteOperationResult<HoverCard> result = new GetHoverCardRemoteOperation(userId).execute(client);
-
-            if (result.isSuccess()) {
-                return result.getResultData();
-            } else {
-                return null;
-            }
-        } catch (ClientFactory.CreationException | NullPointerException e) {
-            return null;
-        }
-    }
-
-    @Override
-    protected void onPostExecute(HoverCard hoverCard) {
-        FragmentActivity activity = this.activityWeakReference.get();
-
-        if (activity != null && activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
-            if (hoverCard.getActions().size() > 0) {
-                new ProfileBottomSheetDialog(activity,
-                        user,
-                        account,
-                        hoverCard)
-                        .show();
-            } else {
-                DisplayUtils.showSnackMessage(activity, R.string.no_actions);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 92ba51383..72b919b27 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -2,17 +2,12 @@ package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
 import android.icu.text.SimpleDateFormat
-import android.net.Uri
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
-import com.owncloud.android.lib.resources.shares.ShareToRemoteOperationResultParser
 import com.owncloud.android.lib.resources.shares.ShareType
-import com.owncloud.android.lib.resources.shares.ShareXMLParser
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
 import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
@@ -48,14 +43,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
         return notesRepository.getShareEntities(noteRemoteId, userName)
     }
 
-    private fun getNotesPath(): Single<String> {
-        return Single.fromCallable {
-            val call = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
-            val response = call.execute()
-            response.body()?.notesPath ?: throw RuntimeException("No notes path available")
-        }.subscribeOn(Schedulers.io())
-    }
-
     fun getSharees(
         searchString: String,
         page: Int,
@@ -109,22 +96,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
     }
 
     fun getShares(remoteId: Long): List<OCShare>? {
-        /*
-         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
-        val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return null
-        val notesPath = notesPathResponseResult.notesPath
-        val notesSuffix = notesPathResponseResult.fileSuffix
-        val remotePath =  "/" + notesPath + "/" + note.title + notesSuffix
-
-        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val call = shareAPI.getSharesForNote(remotePath, true, true)
-
-
-
-        return  null
-
-         */
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.getShares(remoteId)
         val response = call.execute()
@@ -143,26 +114,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    fun getSharesForFile(
-        note: Note,
-        reshares: Boolean = false,
-        subfiles: Boolean = false
-    ): Single<List<OCShare>> {
-        return getNotesPath()
-            .flatMap { notesPath ->
-                Single.fromCallable {
-                    val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-                    val call = shareAPI.getSharesForFile(
-                        remoteFilePath = notesPath + "/" + note.remoteId,
-                        reshares = reshares,
-                        subfiles = subfiles
-                    )
-                    val response = call.execute()
-                    response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
-                }.subscribeOn(Schedulers.io())
-            }
-    }
-
     fun removeShare(
         shareId: Long
     ): Boolean {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
deleted file mode 100644
index be773c7f7..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.server
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
-import java.net.URI
-
-/**
- * This object provides all information necessary to interact
- * with backend server.
- */
-data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
-
-    constructor(source: Parcel) : this(
-        source.readSerializable() as URI,
-        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-        writeSerializable(uri)
-        writeParcelable(version, 0)
-    }
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
-            override fun createFromParcel(source: Parcel): Server = Server(source)
-            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
-        }
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
deleted file mode 100644
index b68c4598d..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.user
-
-import android.accounts.Account
-import android.os.Parcelable
-import com.owncloud.android.lib.common.OwnCloudAccount
-import it.niedermann.owncloud.notes.shared.server.Server
-
-interface User : Parcelable, com.nextcloud.common.User {
-    override val accountName: String
-    val server: Server
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy platform Account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return Account instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    override fun toPlatformAccount(): Account
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy ownCloud account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return OwnCloudAccount instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    fun toOwnCloudAccount(): OwnCloudAccount
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(user: User?): Boolean
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(accountName: CharSequence?): Boolean
-}

From 279ac4d007aeeb8ccb9668a527a19f7392d31603 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 09:16:35 +0100
Subject: [PATCH 050/138] remove unused functionalities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/persistence/ApiProvider.java |  1 -
 .../persistence/ResponseBodyTypeAdapter.kt      | 17 -----------------
 .../owncloud/notes/share/NoteShareActivity.java |  8 ++++----
 .../helper/UsersAndGroupsSearchProvider.java    | 14 ++++----------
 4 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
index 29a259a44..e183b4c18 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
@@ -119,7 +119,6 @@ private synchronized NextcloudAPI getNextcloudAPI(@NonNull Context context, @Non
                     new GsonBuilder()
                             .setStrictness(Strictness.LENIENT)
                             .excludeFieldsWithoutExposeAnnotation()
-                            .registerTypeAdapter(ResponseBody.class, new ResponseBodyTypeAdapter())
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonSerializer<Calendar>) (src, typeOfSrc, ctx) -> new JsonPrimitive(src.getTimeInMillis() / 1_000))
                             .registerTypeHierarchyAdapter(Calendar.class, (JsonDeserializer<Calendar>) (src, typeOfSrc, ctx) -> {
                                 final var calendar = Calendar.getInstance();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt
deleted file mode 100644
index 69af5911b..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ResponseBodyTypeAdapter.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package it.niedermann.owncloud.notes.persistence
-
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonReader
-import com.google.gson.stream.JsonWriter
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.ResponseBody
-
-class ResponseBodyTypeAdapter : TypeAdapter<ResponseBody>() {
-    override fun write(out: JsonWriter, value: ResponseBody?) {
-        throw UnsupportedOperationException("Not needed")
-    }
-
-    override fun read(jsonReader: JsonReader): ResponseBody {
-        return ResponseBody.create("application/json".toMediaTypeOrNull(), jsonReader.nextString())
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 75ef8b924..63e7e8292 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -196,9 +196,9 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    try {
-                        provider.searchForUsersOrGroups(newText, cursor -> {
-                            runOnUiThread(() -> {{
+                    try(var cursor = provider.searchForUsersOrGroups(newText)) {
+                        runOnUiThread(() -> {
+                            {
                                 if (cursor == null || cursor.getCount() == 0) {
                                     suggestionAdapter.changeCursor(null);
                                     return;
@@ -209,7 +209,7 @@ public boolean onQueryTextChange(String newText) {
                                 }
 
                                 binding.progressBar.setVisibility(View.GONE);
-                            }});
+                            }
                         });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 9177be87e..db5852ddf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -29,9 +29,7 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
-import java.util.function.Consumer;
 
-import io.reactivex.disposables.Disposable;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
@@ -41,8 +39,6 @@
  */
 public class UsersAndGroupsSearchProvider {
 
-    private static final String TAG = UsersAndGroupsSearchProvider.class.getSimpleName();
-
     public static final String SHARE_TYPE = "SHARE_TYPE";
     public static final String SHARE_WITH = "SHARE_WITH";
 
@@ -75,7 +71,6 @@ public class UsersAndGroupsSearchProvider {
 
     private final ShareRepository repository;
     private final Context context;
-    private Disposable disposable;
 
     public UsersAndGroupsSearchProvider(Context context, ShareRepository repository) {
         this.context = context;
@@ -107,7 +102,7 @@ private static void setActionShareWith(@NonNull Context context) {
         ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
     }
 
-    public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback) throws JSONException {
+    public Cursor searchForUsersOrGroups(String userQuery) throws JSONException {
         final var names = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE);
         MatrixCursor response = null;
         if (!names.isEmpty()) {
@@ -151,9 +146,9 @@ public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback)
                 }
 
                 if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
+                    // TODO: Why we need this check?
                     // skip all types but users, as E2E secure share is only allowed to users on same server
-                    // TODO: CHECK SKIP LOGIC
-                    //  continue;
+                    // continue;
                 }
 
                 switch (type) {
@@ -233,10 +228,9 @@ public void searchForUsersOrGroups(String userQuery, Consumer<Cursor> callback)
                             .add(SHARE_WITH, shareWith)
                             .add(SHARE_TYPE, type.getValue());
                 }
-
             }
         }
 
-        callback.accept(response);
+        return response;
     }
 }

From ea1e5d7447a0605939dfe77a93f143ed5d81cf10 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 09:55:56 +0100
Subject: [PATCH 051/138] add new capabilities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../sync/CapabilitiesDeserializer.java        | 26 ++++++++++
 .../notes/shared/model/Capabilities.java      | 48 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index be211bd9e..ad2a6355f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -40,13 +40,39 @@ public class CapabilitiesDeserializer implements JsonDeserializer<Capabilities>
     private static final String CAPABILITIES_FILES = "files";
     private static final String CAPABILITIES_FILES_DIRECT_EDITING = "directEditing";
     private static final String CAPABILITIES_FILES_DIRECT_EDITING_SUPPORTS_FILE_ID = "supportsFileId";
+    private static final String CAPABILITIES_FILES_SHARING = "files_sharing";
+    private static final String VERSION = "version";
+
+
 
     @Override
     public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         final var response = new Capabilities();
         final var data = json.getAsJsonObject();
+        if (data.has(VERSION)) {
+            final var version = data.getAsJsonObject(VERSION);
+            final var nextcloudMajorVersion = version.get("major");
+            response.setNextcloudMajorVersion(String.valueOf(nextcloudMajorVersion));
+
+            final var nextcloudMinorVersion = version.get("minor");
+            response.setNextcloudMinorVersion(String.valueOf(nextcloudMinorVersion));
+
+
+            final var nextcloudMicroVersion = version.get("micro");
+            response.setNextcloudMicroVersion(String.valueOf(nextcloudMicroVersion));
+        }
+
         if (data.has(CAPABILITIES)) {
             final var capabilities = data.getAsJsonObject(CAPABILITIES);
+
+            if (capabilities.has(CAPABILITIES_FILES_SHARING)) {
+                final var filesSharing = capabilities.getAsJsonObject(CAPABILITIES_FILES_SHARING);
+                final var federation = filesSharing.getAsJsonObject("federation");
+                final var outgoing = federation.get("outgoing");
+
+                response.setFederationShare(outgoing.getAsBoolean());
+            }
+
             if (capabilities.has(CAPABILITIES_NOTES)) {
                 final var notes = capabilities.getAsJsonObject(CAPABILITIES_NOTES);
                 if (notes.has(CAPABILITIES_NOTES_API_VERSION)) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index 806b94e90..02a1159dd 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -13,6 +13,15 @@
 
 public class Capabilities {
 
+    /**
+     * 30(Major) .0(Minor). 5(Micro)
+     */
+    private String nextcloudMajorVersion = null;
+    private String nextcloudMinorVersion = null;
+    private String nextcloudMicroVersion = null;
+
+    private boolean federationShare = false;
+
     private String apiVersion = null;
     @ColorInt
     private int color = -16743735; // #0082C9
@@ -36,6 +45,41 @@ public String getETag() {
         return eTag;
     }
 
+    @Nullable
+    public String getNextcloudMajorVersion() {
+        return nextcloudMajorVersion;
+    }
+
+    @Nullable
+    public String getNextcloudMinorVersion() {
+        return nextcloudMinorVersion;
+    }
+
+    @Nullable
+    public String getNextcloudMicroVersion() {
+        return nextcloudMicroVersion;
+    }
+
+    public void setNextcloudMajorVersion(@Nullable String nextcloudMajorVersion) {
+        this.nextcloudMajorVersion = nextcloudMajorVersion;
+    }
+
+    public void setNextcloudMinorVersion(@Nullable String nextcloudMinorVersion) {
+        this.nextcloudMinorVersion = nextcloudMinorVersion;
+    }
+
+    public void setNextcloudMicroVersion(@Nullable String nextcloudMicroVersion) {
+        this.nextcloudMicroVersion = nextcloudMicroVersion;
+    }
+
+    public boolean getFederationShare() {
+        return federationShare;
+    }
+
+    public void setFederationShare(boolean value) {
+        this.federationShare = value;
+    }
+
     public void setETag(@Nullable String eTag) {
         this.eTag = eTag;
     }
@@ -69,6 +113,10 @@ public void setDirectEditingAvailable(boolean directEditingAvailable) {
     public String toString() {
         return "Capabilities{" +
                 "apiVersion='" + apiVersion + '\'' +
+                ", nextcloudMajorVersion='" + nextcloudMajorVersion + '\'' +
+                ", nextcloudMinorVersion='" + nextcloudMinorVersion + '\'' +
+                ", nextcloudMicroVersion='" + nextcloudMicroVersion + '\'' +
+                ", federationShare=" + federationShare +
                 ", color=" + color +
                 ", textColor=" + textColor +
                 ", eTag='" + eTag + '\'' +

From 90741fa9c7897ce4449a110c7d81bc3a2f2e7432 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 10:13:42 +0100
Subject: [PATCH 052/138] add new capabilities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../sync/CapabilitiesDeserializer.java        |  2 --
 .../notes/share/NoteShareActivity.java        |  3 +-
 .../helper/UsersAndGroupsSearchProvider.java  | 28 ++-----------------
 .../notes/shared/model/Capabilities.java      |  2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index ad2a6355f..48b5428f5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -43,8 +43,6 @@ public class CapabilitiesDeserializer implements JsonDeserializer<Capabilities>
     private static final String CAPABILITIES_FILES_SHARING = "files_sharing";
     private static final String VERSION = "version";
 
-
-
     @Override
     public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         final var response = new Capabilities();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 63e7e8292..4404a658c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -196,7 +196,8 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    try(var cursor = provider.searchForUsersOrGroups(newText)) {
+
+                    try(var cursor = provider.searchForUsersOrGroups(newText, true)) {
                         runOnUiThread(() -> {
                             {
                                 if (cursor == null || cursor.getCount() == 0) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index db5852ddf..6910bf7fc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -15,7 +15,6 @@
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 
-import androidx.annotation.NonNull;
 
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -25,18 +24,14 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Map;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
+import it.niedermann.owncloud.notes.shared.model.Capabilities;
 
-/**
- * Content provider for search suggestions, to search for users and groups existing in an ownCloud server.
- */
 public class UsersAndGroupsSearchProvider {
 
     public static final String SHARE_TYPE = "SHARE_TYPE";
@@ -57,8 +52,6 @@ public class UsersAndGroupsSearchProvider {
     private static final int RESULTS_PER_PAGE = 50;
     private static final int REQUESTED_PAGE = 1;
 
-    public static String ACTION_SHARE_WITH;
-
     public static final String CONTENT = "content";
 
     private final String AUTHORITY;
@@ -77,7 +70,6 @@ public UsersAndGroupsSearchProvider(Context context, ShareRepository repository)
         this.repository = repository;
 
         AUTHORITY = context.getString(R.string.users_and_groups_search_provider_authority);
-        setActionShareWith(context);
         DATA_USER = AUTHORITY + ".data.user";
         DATA_GROUP = AUTHORITY + ".data.group";
         DATA_ROOM = AUTHORITY + ".data.room";
@@ -85,24 +77,11 @@ public UsersAndGroupsSearchProvider(Context context, ShareRepository repository)
         DATA_EMAIL = AUTHORITY + ".data.email";
         DATA_CIRCLE = AUTHORITY + ".data.circle";
 
-        sShareTypes.put(DATA_USER, ShareType.USER);
-        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
-        sShareTypes.put(DATA_ROOM, ShareType.ROOM);
-        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
-        sShareTypes.put(DATA_EMAIL, ShareType.EMAIL);
-        sShareTypes.put(DATA_CIRCLE, ShareType.CIRCLE);
-
         UriMatcher mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
     }
 
-    private static final Map<String, ShareType> sShareTypes = new HashMap<>();
-
-    private static void setActionShareWith(@NonNull Context context) {
-        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_search_provider_share_with);
-    }
-
-    public Cursor searchForUsersOrGroups(String userQuery) throws JSONException {
+    public Cursor searchForUsersOrGroups(String userQuery, boolean isFederationShareAllowed) throws JSONException {
         final var names = repository.getSharees(userQuery, REQUESTED_PAGE, RESULTS_PER_PAGE);
         MatrixCursor response = null;
         if (!names.isEmpty()) {
@@ -159,8 +138,7 @@ public Cursor searchForUsersOrGroups(String userQuery) throws JSONException {
                         break;
 
                     case FEDERATED:
-                        // TODO: federatedShareAllowed
-                        if (true) {
+                        if (isFederationShareAllowed) {
                             icon = R.drawable.ic_account_circle_grey_24dp;
                             dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index 02a1159dd..17a6460ed 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -72,7 +72,7 @@ public void setNextcloudMicroVersion(@Nullable String nextcloudMicroVersion) {
         this.nextcloudMicroVersion = nextcloudMicroVersion;
     }
 
-    public boolean getFederationShare() {
+    public boolean isFederationShareAllowed() {
         return federationShare;
     }
 

From 7d2db4d12de38b461da8d896d05049d9abfc476c Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 10:25:50 +0100
Subject: [PATCH 053/138] save capabilities as entity

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/NotesDatabase.java         |  7 ++++++-
 .../notes/persistence/NotesRepository.java       |  6 ++++++
 .../notes/persistence/dao/CapabilitiesDao.kt     | 16 ++++++++++++++++
 .../owncloud/notes/share/NoteShareActivity.java  |  4 ++--
 .../notes/share/repository/ShareRepository.kt    |  3 +++
 .../notes/shared/model/Capabilities.java         | 11 +++++++++--
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/CapabilitiesDao.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
index e8f5570ef..1df1c22d1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
@@ -17,6 +17,7 @@
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
 import it.niedermann.owncloud.notes.persistence.dao.AccountDao;
+import it.niedermann.owncloud.notes.persistence.dao.CapabilitiesDao;
 import it.niedermann.owncloud.notes.persistence.dao.CategoryOptionsDao;
 import it.niedermann.owncloud.notes.persistence.dao.NoteDao;
 import it.niedermann.owncloud.notes.persistence.dao.ShareDao;
@@ -45,6 +46,7 @@
 import it.niedermann.owncloud.notes.persistence.migration.Migration_23_24;
 import it.niedermann.owncloud.notes.persistence.migration.Migration_24_25;
 import it.niedermann.owncloud.notes.persistence.migration.Migration_9_10;
+import it.niedermann.owncloud.notes.shared.model.Capabilities;
 
 @Database(
         entities = {
@@ -53,7 +55,8 @@
                 CategoryOptions.class,
                 SingleNoteWidgetData.class,
                 NotesListWidgetData.class,
-                ShareEntity.class
+                ShareEntity.class,
+                Capabilities.class
         }, version = 26
 )
 @TypeConverters({Converters.class})
@@ -120,4 +123,6 @@ public void onCreate(@NonNull SupportSQLiteDatabase db) {
     public abstract WidgetNotesListDao getWidgetNotesListDao();
 
     public abstract ShareDao getShareDao();
+
+    public abstract CapabilitiesDao getCapabilitiesDao();
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 33aafc0d2..37c52d5cb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -225,6 +225,8 @@ protected void finalize() throws Throwable {
     // Accounts
     @AnyThread
     public LiveData<ImportStatus> addAccount(@NonNull String url, @NonNull String username, @NonNull String accountName, @NonNull Capabilities capabilities, @Nullable String displayName, @NonNull IResponseCallback<Account> callback) {
+        db.getCapabilitiesDao().insert(capabilities);
+
         final var account = db.getAccountDao().getAccountById(db.getAccountDao().insert(new Account(url, username, accountName, displayName, capabilities)));
         if (account == null) {
             callback.onError(new Exception("Could not read created account."));
@@ -285,6 +287,10 @@ public void deleteAccount(@NonNull Account account) {
         db.getAccountDao().deleteAccount(account);
     }
 
+    public Capabilities getCapabilities() {
+        return db.getCapabilitiesDao().getCapabilities();
+    }
+
     public Account getAccountByName(String accountName) {
         return db.getAccountDao().getAccountByName(accountName);
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/CapabilitiesDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/CapabilitiesDao.kt
new file mode 100644
index 000000000..ed8b3d1c8
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/CapabilitiesDao.kt
@@ -0,0 +1,16 @@
+package it.niedermann.owncloud.notes.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import it.niedermann.owncloud.notes.shared.model.Capabilities
+
+@Dao
+interface CapabilitiesDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insert(capabilities: Capabilities)
+
+    @Query("SELECT * FROM capabilities WHERE id = 1")
+    fun getCapabilities(): Capabilities
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 4404a658c..54b337043 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -196,8 +196,8 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-
-                    try(var cursor = provider.searchForUsersOrGroups(newText, true)) {
+                    final var isFederationShareAllowed = repository.capabilities().getFederationShare();
+                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
                         runOnUiThread(() -> {
                             {
                                 if (cursor == null || cursor.getCount() == 0) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 72b919b27..2e51c0fe0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -19,6 +19,7 @@ import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
+import it.niedermann.owncloud.notes.shared.model.Capabilities
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
@@ -95,6 +96,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun capabilities(): Capabilities = notesRepository.capabilities
+
     fun getShares(remoteId: Long): List<OCShare>? {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.getShares(remoteId)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index 17a6460ed..82bf7299b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -10,8 +10,15 @@
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
 
-public class Capabilities {
+import java.io.Serializable;
+
+@Entity(tableName = "capabilities")
+public class Capabilities implements Serializable {
+    @PrimaryKey
+    public int id = 1;
 
     /**
      * 30(Major) .0(Minor). 5(Micro)
@@ -72,7 +79,7 @@ public void setNextcloudMicroVersion(@Nullable String nextcloudMicroVersion) {
         this.nextcloudMicroVersion = nextcloudMicroVersion;
     }
 
-    public boolean isFederationShareAllowed() {
+    public boolean getFederationShare() {
         return federationShare;
     }
 

From 82c0c611e259750e0fb6e05676fa86041952e932 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 10:59:41 +0100
Subject: [PATCH 054/138] fix flow

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java      |  1 -
 .../owncloud/notes/share/NoteShareDetailActivity.kt  | 12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 54b337043..0d49c56b4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -201,7 +201,6 @@ public boolean onQueryTextChange(String newText) {
                         runOnUiThread(() -> {
                             {
                                 if (cursor == null || cursor.getCount() == 0) {
-                                    suggestionAdapter.changeCursor(null);
                                     return;
                                 }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index e4fbd8f04..502bd6605 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -1,5 +1,6 @@
 package it.niedermann.owncloud.notes.share
 
+import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import android.text.TextUtils
@@ -14,6 +15,7 @@ import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.branding.BrandedActivity
 import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
+import it.niedermann.owncloud.notes.main.MainActivity
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
@@ -97,8 +99,6 @@ class NoteShareDetailActivity : BrandedActivity(),
             isSecureShare = it.getBoolean(ARG_SECURE_SHARE, false)
         }
 
-        // capabilities = CapabilityUtils.getCapability(context)
-
         lifecycleScope.launch(Dispatchers.IO) {
             val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
             repository = ShareRepository(this@NoteShareDetailActivity, ssoAcc)
@@ -340,6 +340,7 @@ class NoteShareDetailActivity : BrandedActivity(),
             binding.noteText.setText(R.string.empty)
         }
         shareProcessStep = SCREEN_TYPE_NOTE
+        binding.shareProcessBtnNext.performClick()
     }
 
     private fun implementClickEvents() {
@@ -557,9 +558,12 @@ class NoteShareDetailActivity : BrandedActivity(),
     private suspend fun handleResult(success: Boolean) {
         withContext(Dispatchers.Main) {
             if (success) {
-                finish()
+                Intent(this@NoteShareDetailActivity, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                }.also {
+                    startActivity(it)
+                }
             } else {
-
                 DisplayUtils.showSnackMessage(
                     this@NoteShareDetailActivity,
                     getString(R.string.note_share_detail_activity_create_share_error)

From 9b1e33465384480fd0f9d5a2e12ea4a768a8666a Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 11:39:03 +0100
Subject: [PATCH 055/138] fix update logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  9 +++-
 .../notes/share/NoteShareDetailActivity.kt    | 27 ++++++++---
 .../helper/UsersAndGroupsSearchProvider.java  |  2 -
 .../notes/share/model/SharePasswordRequest.kt |  5 ++
 .../notes/share/model/UpdateShareRequest.kt   | 13 +++++-
 .../notes/share/repository/ShareRepository.kt | 46 +++++++++++++------
 6 files changed, 75 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/SharePasswordRequest.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 00e55dfa1..3ceb52774 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -6,6 +6,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
+import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
@@ -16,6 +17,7 @@ import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -39,12 +41,15 @@ interface ShareAPI {
     @DELETE("shares/{shareId}?format=json")
     fun removeShare(@Path("shareId") shareId: Long): Call<Any>
 
-    @PATCH("shares")
-    fun updateShare(@Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
+    @PUT("shares/{shareId}?format=json")
+    fun updateShare(@Path("shareId") shareId: Long, @Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
     @POST("shares?format=json")
     fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
+    @POST("shares/{shareId}/send-email?format=json")
+    fun sendEmail(@Path("shareId") shareId: Long, @Body password: SharePasswordRequest?): Call<Any>
+
     @PATCH("shares/{shareId}")
     fun updateShareInfo(
         @Path("shareId") shareId: Long,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 502bd6605..c9253d6c2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -20,6 +20,8 @@ import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
+import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
+import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil
@@ -30,6 +32,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 /**
  * Activity class to show share permission options, set expiration date, change label, set password, send note
@@ -491,9 +494,6 @@ class NoteShareDetailActivity : BrandedActivity(),
 
     private fun updateShare() {
         lifecycleScope.launch(Dispatchers.IO) {
-            val ssoAcc =
-                SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
-
             if (share == null) {
                 Log_OC.d(TAG, "Share is null cannot updateShare")
                 return@launch
@@ -522,12 +522,25 @@ class NoteShareDetailActivity : BrandedActivity(),
      */
     private fun createOrUpdateShare() {
         val noteText = binding.noteText.text.toString().trim()
+        val password = binding.shareProcessEnterPassword.text.toString().trim()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            // if modifying existing share then directly update the note and send email
             if (share != null && share?.note != noteText) {
-                val result = repository.updateShare(share!!.id, noteText)
-                handleResult(result)
+                val expirationDate = if (chosenExpDateInMills != -1L) {
+                    SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(chosenExpDateInMills))
+                } else {
+                    null
+                }
+
+                val requestBody = UpdateShareRequest(share!!.id.toInt(), noteText, password, expirationDate, "true")
+                val updateShareResult = repository.updateShare(share!!.id, requestBody)
+
+                if (updateShareResult) {
+                    val sendEmailResult = repository.sendEmail(share!!.id, SharePasswordRequest(password))
+                    handleResult(sendEmailResult)
+                } else {
+                    handleResult(false)
+                }
             } else {
                 if (note == null || shareeName == null) {
                     Log_OC.d(TAG, "validateShareProcessSecond cancelled")
@@ -539,7 +552,7 @@ class NoteShareDetailActivity : BrandedActivity(),
                     shareType,
                     shareeName!!,
                     "false", // TODO: Check how to determine it
-                    binding.shareProcessEnterPassword.text.toString().trim(),
+                    password,
                     permission,
                     noteText
                 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index 6910bf7fc..af675e696 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -15,7 +15,6 @@
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 
-
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.users.Status;
@@ -30,7 +29,6 @@
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
-import it.niedermann.owncloud.notes.shared.model.Capabilities;
 
 public class UsersAndGroupsSearchProvider {
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/SharePasswordRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/SharePasswordRequest.kt
new file mode 100644
index 000000000..b752d79c4
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/SharePasswordRequest.kt
@@ -0,0 +1,5 @@
+package it.niedermann.owncloud.notes.share.model
+
+data class SharePasswordRequest(
+    val password: String
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
index e5f79c9ae..9a061b350 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -4,8 +4,17 @@ import com.google.gson.annotations.Expose
 
 data class UpdateShareRequest(
     @Expose
-    val shareId: String,
+    val share_id: Int,
 
     @Expose
-    val noteText: String
+    val note: String,
+
+    @Expose
+    val password: String,
+
+    @Expose
+    val expireDate: String?,
+
+    @Expose
+    val sendMail: String
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 2e51c0fe0..1a546da64 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -14,6 +14,7 @@ import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
+import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
@@ -117,6 +118,24 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun sendEmail(shareId: Long, requestBody: SharePasswordRequest): Boolean {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.sendEmail(shareId , requestBody)
+        val response = call.execute()
+
+        return try {
+            if (response.isSuccessful) {
+                true
+            } else {
+                Log_OC.d(tag, "Failed to send-email: ${response.errorBody()?.string()}")
+                false
+            }
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while send-email: $e")
+            false
+        }
+    }
+
     fun removeShare(
         shareId: Long
     ): Boolean {
@@ -137,23 +156,22 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    fun updateShare(
-        shareId: Long,
-        noteText: String
-    ): Boolean {
+    fun updateShare(shareId: Long, requestBody: UpdateShareRequest): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val requestBody = UpdateShareRequest(shareId.toString(), noteText)
-        val call = shareAPI.updateShare(requestBody)
+        val call = shareAPI.updateShare(shareId, requestBody)
         val response = call.execute()
-        if (response.isSuccessful) {
-            val updateShareResponse = response.body()
-            Log_OC.d(tag, "Response successful: $updateShareResponse")
-        } else {
-            val errorBody = response.errorBody()?.string()
-            Log_OC.d(tag, "Response failed:$errorBody")
-        }
+        return try {
+            if (response.isSuccessful) {
+                Log_OC.d(tag, "Share updated successfully: ${response.body()}")
+            } else {
+                Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
+            }
 
-        return response.isSuccessful
+            response.isSuccessful
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while updating share", e)
+           false
+        }
     }
 
     fun addShare(

From 3d5d6ab9eab83ea90c0ee9bd41e207313b0198cb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 11:44:55 +0100
Subject: [PATCH 056/138] separate logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareDetailActivity.kt    | 86 +++++++++++--------
 .../notes/share/repository/ShareRepository.kt |  6 +-
 2 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index c9253d6c2..bc73a8b65 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -474,7 +474,7 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         // if modifying existing share information then execute the process
         if (share != null) {
-            updateShare()
+            updateShareInformation()
         } else {
             // else show step 2 (note screen)
             showShareProcessSecond()
@@ -492,7 +492,7 @@ class NoteShareDetailActivity : BrandedActivity(),
         else -> permission
     }
 
-    private fun updateShare() {
+    private fun updateShareInformation() {
         lifecycleScope.launch(Dispatchers.IO) {
             if (share == null) {
                 Log_OC.d(TAG, "Share is null cannot updateShare")
@@ -502,7 +502,7 @@ class NoteShareDetailActivity : BrandedActivity(),
             repository.updateShareInformation(
                 share!!.id,
                 binding.shareProcessEnterPassword.text.toString().trim(),
-                chosenExpDateInMills,
+                getExpirationDate(),
                 permission,
                 binding.shareProcessHideDownloadCheckbox.isChecked,
                 "", // TODO: Check note?
@@ -517,6 +517,16 @@ class NoteShareDetailActivity : BrandedActivity(),
         }
     }
 
+    private fun getExpirationDate(): String? {
+        if (chosenExpDateInMills == -1L) {
+            return null
+        }
+
+        val date = Date(chosenExpDateInMills)
+
+        return SimpleDateFormat("yyyy-MM-dd", Locale.US).format(date)
+    }
+
     /**
      * method to validate step 2 (note screen) information
      */
@@ -526,46 +536,48 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         lifecycleScope.launch(Dispatchers.IO) {
             if (share != null && share?.note != noteText) {
-                val expirationDate = if (chosenExpDateInMills != -1L) {
-                    SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(chosenExpDateInMills))
-                } else {
-                    null
-                }
+                updateShare(noteText, password)
+            } else {
+                createShare(noteText, password)
+            }
+        }
+    }
 
-                val requestBody = UpdateShareRequest(share!!.id.toInt(), noteText, password, expirationDate, "true")
-                val updateShareResult = repository.updateShare(share!!.id, requestBody)
+    private suspend fun updateShare(noteText: String, password: String) {
+        val requestBody = UpdateShareRequest(share!!.id.toInt(), noteText, password, getExpirationDate(), "true")
+        val updateShareResult = repository.updateShare(share!!.id, requestBody)
 
-                if (updateShareResult) {
-                    val sendEmailResult = repository.sendEmail(share!!.id, SharePasswordRequest(password))
-                    handleResult(sendEmailResult)
-                } else {
-                    handleResult(false)
-                }
-            } else {
-                if (note == null || shareeName == null) {
-                    Log_OC.d(TAG, "validateShareProcessSecond cancelled")
-                    return@launch
-                }
+        if (updateShareResult) {
+            val sendEmailResult = repository.sendEmail(share!!.id, SharePasswordRequest(password))
+            handleResult(sendEmailResult)
+        } else {
+            handleResult(false)
+        }
+    }
 
-                val result = repository.addShare(
-                    note!!,
-                    shareType,
-                    shareeName!!,
-                    "false", // TODO: Check how to determine it
-                    password,
-                    permission,
-                    noteText
-                )
+    private suspend fun createShare(noteText: String, password: String) {
+        if (note == null || shareeName == null) {
+            Log_OC.d(TAG, "validateShareProcessSecond cancelled")
+            return
+        }
 
-                if (result != null) {
-                    val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
-                    val entity = ShareEntity(result.id.toInt(), note?.remoteId!!, ssoAcc.name)
-                    repository.addShareEntity(entity)
-                }
+        val result = repository.addShare(
+            note!!,
+            shareType,
+            shareeName!!,
+            "false", // TODO: Check how to determine it
+            password,
+            permission,
+            noteText
+        )
 
-                handleResult(result != null)
-            }
+        if (result != null) {
+            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+            val entity = ShareEntity(result.id.toInt(), note?.remoteId!!, ssoAcc.name)
+            repository.addShareEntity(entity)
         }
+
+        handleResult(result != null)
     }
 
     private suspend fun handleResult(success: Boolean) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 1a546da64..bf9218242 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -216,7 +216,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
     fun updateShareInformation(
         shareId: Long,
         password: String? = null,
-        expirationDateMillis: Long? = null,
+        expirationDate: String? = null,
         permissions: Int? = null,
         hideFileDownload: Boolean? = null,
         note: String? = null,
@@ -229,10 +229,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
 
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
 
-        val expirationDate = expirationDateMillis?.let {
-            SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(it))
-        }
-
         val requestBody = UpdateShareInformationRequest(
             shareId = shareId.toString(),
             password = password,

From 7fc7a9d32acebb1bd975874ad5d1ed25c4f69948 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 12:28:32 +0100
Subject: [PATCH 057/138] remove duplicated logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        | 17 +----
 .../notes/share/NoteShareDetailActivity.kt    | 73 +++++++++++--------
 .../model/UpdateShareInformationRequest.kt    | 27 -------
 .../notes/share/model/UpdateShareRequest.kt   | 20 ++++-
 .../notes/share/repository/ShareRepository.kt | 45 ------------
 5 files changed, 64 insertions(+), 118 deletions(-)
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 3ceb52774..7b9a2b527 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -1,13 +1,9 @@
 package it.niedermann.owncloud.notes.persistence.sync
 
 import com.google.gson.internal.LinkedTreeMap
-import com.nextcloud.android.sso.api.EmptyResponse
-import com.owncloud.android.lib.common.operations.RemoteOperation
-import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
-import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.shared.model.OcsResponse
@@ -15,7 +11,6 @@ import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
-import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
@@ -41,22 +36,16 @@ interface ShareAPI {
     @DELETE("shares/{shareId}?format=json")
     fun removeShare(@Path("shareId") shareId: Long): Call<Any>
 
-    @PUT("shares/{shareId}?format=json")
-    fun updateShare(@Path("shareId") shareId: Long, @Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
-
     @POST("shares?format=json")
     fun addShare(@Body request: CreateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
     @POST("shares/{shareId}/send-email?format=json")
     fun sendEmail(@Path("shareId") shareId: Long, @Body password: SharePasswordRequest?): Call<Any>
 
-    @PATCH("shares/{shareId}")
-    fun updateShareInfo(
-        @Path("shareId") shareId: Long,
-        @Body request: UpdateShareInformationRequest
-    ): Call<OcsResponse<CreateShareResponse>>
+    @PUT("shares/{shareId}?format=json")
+    fun updateShare(@Path("shareId") shareId: Long, @Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
-    @PATCH("shares/{shareId}")
+    @PUT("shares/{shareId}")
     fun updateSharePermission(
         @Path("shareId") shareId: Long,
         @Body request: UpdateSharePermissionRequest
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index bc73a8b65..a4c509edb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import androidx.lifecycle.lifecycleScope
+import com.google.gson.Gson
 import com.nextcloud.android.sso.helper.SingleAccountHelper
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -20,6 +21,7 @@ import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
+import it.niedermann.owncloud.notes.share.model.ShareAttributes
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
@@ -77,6 +79,7 @@ class NoteShareDetailActivity : BrandedActivity(),
 
     private var expirationDatePickerFragment: ExpirationDatePickerDialogFragment? = null
     private lateinit var repository: ShareRepository
+    private val gson = Gson()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -474,7 +477,12 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         // if modifying existing share information then execute the process
         if (share != null) {
-            updateShareInformation()
+            lifecycleScope.launch(Dispatchers.IO) {
+                val noteText = binding.noteText.text.toString().trim()
+                val password = binding.shareProcessEnterPassword.text.toString().trim()
+
+                updateShare(noteText, password, false)
+            }
         } else {
             // else show step 2 (note screen)
             showShareProcessSecond()
@@ -492,31 +500,6 @@ class NoteShareDetailActivity : BrandedActivity(),
         else -> permission
     }
 
-    private fun updateShareInformation() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            if (share == null) {
-                Log_OC.d(TAG, "Share is null cannot updateShare")
-                return@launch
-            }
-
-            repository.updateShareInformation(
-                share!!.id,
-                binding.shareProcessEnterPassword.text.toString().trim(),
-                getExpirationDate(),
-                permission,
-                binding.shareProcessHideDownloadCheckbox.isChecked,
-                "", // TODO: Check note?
-                binding.shareProcessChangeName.text.toString().trim()
-            )
-
-            withContext(Dispatchers.Main) {
-                if (!TextUtils.isEmpty(share?.shareLink)) {
-                    ClipboardUtil.copyToClipboard(this@NoteShareDetailActivity, share?.shareLink)
-                }
-            }
-        }
-    }
-
     private fun getExpirationDate(): String? {
         if (chosenExpDateInMills == -1L) {
             return null
@@ -536,22 +519,50 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         lifecycleScope.launch(Dispatchers.IO) {
             if (share != null && share?.note != noteText) {
-                updateShare(noteText, password)
+                updateShare(noteText, password, true)
             } else {
                 createShare(noteText, password)
             }
         }
     }
 
-    private suspend fun updateShare(noteText: String, password: String) {
-        val requestBody = UpdateShareRequest(share!!.id.toInt(), noteText, password, getExpirationDate(), "true")
+    private suspend fun updateShare(noteText: String, password: String, sendEmail: Boolean) {
+        val shareAttributes = arrayOf(
+            ShareAttributes(
+                scope = "permissions",
+                key = "download",
+                value = binding.shareProcessHideDownloadCheckbox.isChecked
+            )
+        )
+
+        val attributes = gson.toJson(shareAttributes)
+
+        val requestBody = UpdateShareRequest(
+            share_id = share!!.id.toInt(),
+            permissions = permission,
+            password = password,
+            publicUpload = "false",
+            expireDate = getExpirationDate(),
+            note = noteText,
+            attributes = attributes,
+            sendMail = sendEmail.toString()
+        )
+
         val updateShareResult = repository.updateShare(share!!.id, requestBody)
 
-        if (updateShareResult) {
+        if (updateShareResult && sendEmail) {
             val sendEmailResult = repository.sendEmail(share!!.id, SharePasswordRequest(password))
             handleResult(sendEmailResult)
         } else {
-            handleResult(false)
+            handleResult(updateShareResult)
+        }
+
+        if (!sendEmail) {
+            withContext(Dispatchers.Main) {
+                if (!TextUtils.isEmpty(share?.shareLink)) {
+                    ClipboardUtil.copyToClipboard(this@NoteShareDetailActivity, share?.shareLink)
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt
deleted file mode 100644
index a8f129745..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareInformationRequest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package it.niedermann.owncloud.notes.share.model
-
-import com.google.gson.annotations.Expose
-import com.google.gson.annotations.SerializedName
-
-data class UpdateShareInformationRequest(
-    @Expose
-    @SerializedName("shareId") val shareId: String,
-
-    @Expose
-    @SerializedName("password") val password: String? = null,
-
-    @Expose
-    @SerializedName("expireDate") val expireDate: String? = null,
-
-    @Expose
-    @SerializedName("permissions") val permissions: Int? = null,
-
-    @Expose
-    @SerializedName("hideDownload") val hideDownload: Boolean? = null,
-
-    @Expose
-    @SerializedName("note") val note: String? = null,
-
-    @Expose
-    @SerializedName("label") val label: String? = null
-)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
index 9a061b350..ed556b32e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -7,14 +7,32 @@ data class UpdateShareRequest(
     val share_id: Int,
 
     @Expose
-    val note: String,
+    val permissions: Int,
 
     @Expose
     val password: String,
 
+    @Expose
+    val publicUpload: String,
+
     @Expose
     val expireDate: String?,
 
+    @Expose
+    val note: String,
+
+    /**
+     * Array of ShareAttributes data class in JSON format
+     */
+    @Expose
+    val attributes: String?,
+
     @Expose
     val sendMail: String
 )
+
+data class ShareAttributes(
+    var scope: String,
+    var key: String,
+    var value: Boolean
+)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index bf9218242..3eb6c18ed 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -1,7 +1,6 @@
 package it.niedermann.owncloud.notes.share.repository
 
 import android.content.Context
-import android.icu.text.SimpleDateFormat
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap
 import com.nextcloud.android.sso.model.SingleSignOnAccount
@@ -15,7 +14,6 @@ import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
-import it.niedermann.owncloud.notes.share.model.UpdateShareInformationRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.model.toOCShare
@@ -24,8 +22,6 @@ import it.niedermann.owncloud.notes.shared.model.Capabilities
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
-import java.util.Date
-import java.util.Locale
 
 class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
 
@@ -213,47 +209,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    fun updateShareInformation(
-        shareId: Long,
-        password: String? = null,
-        expirationDate: String? = null,
-        permissions: Int? = null,
-        hideFileDownload: Boolean? = null,
-        note: String? = null,
-        label: String? = null
-    ): Boolean {
-        if (shareId <= 0) {
-            Log_OC.d(tag, "share id is not valid, updateShareInformation cancelled")
-            return false
-        }
-
-        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-
-        val requestBody = UpdateShareInformationRequest(
-            shareId = shareId.toString(),
-            password = password,
-            expireDate = expirationDate,
-            permissions = permissions,
-            hideDownload = hideFileDownload,
-            note = note,
-            label = label
-        )
-
-        return try {
-            val call = shareAPI.updateShareInfo(shareId, requestBody)
-            val response = call.execute()
-            if (response.isSuccessful) {
-                Log_OC.d(tag, "Share updated successfully: ${response.body()}")
-            } else {
-                Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
-            }
-            response.isSuccessful
-        } catch (e: Exception) {
-            Log_OC.d(tag, "Exception while updating share", e)
-            false
-        }
-    }
-
     fun updateSharePermission(
         shareId: Long,
         permissions: Int? = null,

From cef1f0c86f2022197667806c833c957c882b240b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 12:31:48 +0100
Subject: [PATCH 058/138] remove duplicated logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 7b9a2b527..5f845706f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -45,7 +45,7 @@ interface ShareAPI {
     @PUT("shares/{shareId}?format=json")
     fun updateShare(@Path("shareId") shareId: Long, @Body request: UpdateShareRequest): Call<OcsResponse<CreateShareResponse>>
 
-    @PUT("shares/{shareId}")
+    @PUT("shares/{shareId}?format=json")
     fun updateSharePermission(
         @Path("shareId") shareId: Long,
         @Body request: UpdateSharePermissionRequest

From b6df0e9e5e040c2cd38b413b0158af5a48d0aea5 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 12:39:11 +0100
Subject: [PATCH 059/138] add ShareAttributes versions

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareDetailActivity.kt    | 24 ++++++++++++++-----
 .../notes/share/model/UpdateShareRequest.kt   |  8 ++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index a4c509edb..01f6c7108 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -21,7 +21,8 @@ import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
-import it.niedermann.owncloud.notes.share.model.ShareAttributes
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
@@ -527,12 +528,23 @@ class NoteShareDetailActivity : BrandedActivity(),
     }
 
     private suspend fun updateShare(noteText: String, password: String, sendEmail: Boolean) {
+        val capabilities = repository.capabilities()
+        val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) > 30
+
         val shareAttributes = arrayOf(
-            ShareAttributes(
-                scope = "permissions",
-                key = "download",
-                value = binding.shareProcessHideDownloadCheckbox.isChecked
-            )
+            if (shouldUseShareAttributesV2) {
+                ShareAttributesV2(
+                    scope = "permissions",
+                    key = "download",
+                    value = binding.shareProcessHideDownloadCheckbox.isChecked
+                )
+            } else {
+                ShareAttributesV1(
+                    scope = "permissions",
+                    key = "download",
+                    enabled = binding.shareProcessHideDownloadCheckbox.isChecked
+                )
+            }
         )
 
         val attributes = gson.toJson(shareAttributes)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
index ed556b32e..23f96ef4d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -31,8 +31,14 @@ data class UpdateShareRequest(
     val sendMail: String
 )
 
-data class ShareAttributes(
+data class ShareAttributesV2(
     var scope: String,
     var key: String,
     var value: Boolean
 )
+
+data class ShareAttributesV1(
+    var scope: String,
+    var key: String,
+    var enabled: Boolean
+)

From 11766b4be144288496ba14de057574fbfb32cecb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 13:57:53 +0100
Subject: [PATCH 060/138] fix condition for shouldUseShareAttributesV2

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 01f6c7108..2339bc65e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -529,7 +529,7 @@ class NoteShareDetailActivity : BrandedActivity(),
 
     private suspend fun updateShare(noteText: String, password: String, sendEmail: Boolean) {
         val capabilities = repository.capabilities()
-        val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) > 30
+        val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
 
         val shareAttributes = arrayOf(
             if (shouldUseShareAttributesV2) {

From e4a9f1cdb118edf9f622ad927013ec6920b51f01 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 14:58:11 +0100
Subject: [PATCH 061/138] fix avatar loader

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../AccountSwitcherDialog.java                |  9 ++---
 .../AccountSwitcherViewHolder.java            | 13 ++-----
 .../owncloud/notes/main/MainActivity.java     |  1 +
 .../ManageAccountViewHolder.java              | 11 ++----
 .../notes/persistence/entity/Account.java     |  5 +++
 .../notes/share/NoteShareActivity.java        | 14 ++------
 .../notes/share/NoteShareDetailActivity.kt    |  5 +--
 .../notes/share/adapter/SuggestionAdapter.kt  | 26 +++++++++-----
 .../share/adapter/holder/ShareViewHolder.java | 14 +++-----
 .../share/dialog/ProfileBottomSheetDialog.kt  | 16 ++-------
 .../notes/share/helper/AvatarLoader.kt        | 34 +++++++++++++++++++
 .../helper/UsersAndGroupsSearchProvider.java  | 14 +-------
 .../account/AccountChooserViewHolder.java     | 15 ++------
 13 files changed, 78 insertions(+), 99 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/helper/AvatarLoader.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
index 3c9e4e20f..c11b8d311 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
@@ -18,8 +18,6 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import it.niedermann.owncloud.notes.NotesApplication;
@@ -30,6 +28,7 @@
 import it.niedermann.owncloud.notes.manageaccounts.ManageAccountsActivity;
 import it.niedermann.owncloud.notes.persistence.NotesRepository;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 
 /**
  * Displays all available {@link Account} entries and provides basic operations for them, like adding or switching
@@ -74,11 +73,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
             binding.accountName.setText(currentLocalAccount.getDisplayName());
             binding.accountHost.setText(Uri.parse(currentLocalAccount.getUrl()).getHost());
-            Glide.with(requireContext())
-                    .load(currentLocalAccount.getUrl() + "/index.php/avatar/" + Uri.encode(currentLocalAccount.getUserName()) + "/64")
-                    .error(R.drawable.ic_account_circle_grey_24dp)
-                    .apply(RequestOptions.circleCropTransform())
-                    .into(binding.currentAccountItemAvatar);
+            AvatarLoader.INSTANCE.load(requireContext(), binding.currentAccountItemAvatar, currentLocalAccount);
             binding.accountLayout.setOnClickListener((v) -> dismiss());
 
             final var adapter = new AccountSwitcherAdapter((localAccount -> {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
index b3119fdd5..d128e07ef 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
@@ -14,13 +14,9 @@
 import androidx.core.util.Consumer;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
-import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 
 public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder {
 
@@ -34,12 +30,7 @@ public AccountSwitcherViewHolder(@NonNull View itemView) {
     public void bind(@NonNull Account localAccount, @NonNull Consumer<Account> onAccountClick) {
         binding.accountName.setText(localAccount.getDisplayName());
         binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());
-        Glide.with(itemView.getContext())
-                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(localAccount.getUserName()) + "/64"))
-                .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.accountItemAvatar);
+        AvatarLoader.INSTANCE.load(itemView.getContext(), binding.accountItemAvatar, localAccount);
         itemView.setOnClickListener((v) -> onAccountClick.accept(localAccount));
         binding.accountContextMenu.setVisibility(View.GONE);
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index d75a99130..0a83f12a8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -99,6 +99,7 @@
 import it.niedermann.owncloud.notes.persistence.CapabilitiesWorker;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.shared.model.CategorySortingMethod;
 import it.niedermann.owncloud.notes.shared.model.IResponseCallback;
 import it.niedermann.owncloud.notes.shared.model.NavigationCategory;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
index 49d7b0734..b2de7704d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
@@ -18,14 +18,11 @@
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 
 public class ManageAccountViewHolder extends RecyclerView.ViewHolder {
 
@@ -43,11 +40,7 @@ public void bind(
     ) {
         binding.accountName.setText(localAccount.getUserName());
         binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());
-        Glide.with(itemView.getContext())
-                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(localAccount.getUserName()) + "/64"))
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.accountItemAvatar);
+        AvatarLoader.INSTANCE.load(itemView.getContext(), binding.accountItemAvatar, localAccount);
         itemView.setOnClickListener((v) -> callback.onSelect(localAccount));
         binding.accountContextMenu.setVisibility(VISIBLE);
         binding.accountContextMenu.setOnClickListener((v) -> {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
index a8fc3ba56..6b3c46a5b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
@@ -7,6 +7,7 @@
 package it.niedermann.owncloud.notes.persistence.entity;
 
 import android.graphics.Color;
+import android.net.Uri;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -93,6 +94,10 @@ public String getUrl() {
         return url;
     }
 
+    public String getAvatarUrl() {
+        return url + "/index.php/avatar/" + Uri.encode(userName) + "/64";
+    }
+
     public void setUrl(@NonNull String url) {
         this.url = url;
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 0d49c56b4..b0f132b10 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -27,8 +27,6 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -43,7 +41,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
@@ -57,6 +54,7 @@
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
@@ -162,7 +160,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null, account);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -301,13 +299,7 @@ private void setShareWithYou() {
     }
 
     private void loadAvatar() {
-        Glide.with(this)
-                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.sharedWithYouAvatar);
-
+        AvatarLoader.INSTANCE.load(this, binding.sharedWithYouAvatar, account);
         binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 2339bc65e..0a14dad0f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -530,19 +530,20 @@ class NoteShareDetailActivity : BrandedActivity(),
     private suspend fun updateShare(noteText: String, password: String, sendEmail: Boolean) {
         val capabilities = repository.capabilities()
         val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
+        val downloadPermission = !binding.shareProcessHideDownloadCheckbox.isChecked
 
         val shareAttributes = arrayOf(
             if (shouldUseShareAttributesV2) {
                 ShareAttributesV2(
                     scope = "permissions",
                     key = "download",
-                    value = binding.shareProcessHideDownloadCheckbox.isChecked
+                    value = downloadPermission
                 )
             } else {
                 ShareAttributesV1(
                     scope = "permissions",
                     key = "download",
-                    enabled = binding.shareProcessHideDownloadCheckbox.isChecked
+                    enabled = downloadPermission
                 )
             }
         )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
index 50a3c0fa2..f057c7124 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt
@@ -9,10 +9,14 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.database.getIntOrNull
+import androidx.core.database.getStringOrNull
 import androidx.cursoradapter.widget.CursorAdapter
 import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.persistence.entity.Account
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader
 
-class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(context, cursor, false) {
+class SuggestionAdapter(context: Context, cursor: Cursor?, private val account: Account) : CursorAdapter(context, cursor, false) {
     override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
         val inflater = LayoutInflater.from(context)
         return inflater.inflate(R.layout.item_suggestion_adapter, parent, false)
@@ -29,15 +33,19 @@ class SuggestionAdapter(context: Context, cursor: Cursor?) : CursorAdapter(conte
 
         if (iconColumn != -1) {
             try {
-                val iconId = cursor.getInt(iconColumn)
-                icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
+                val iconId = cursor.getIntOrNull(iconColumn)
+                if (iconId != null) {
+                    icon.setImageDrawable(ContextCompat.getDrawable(context, iconId))
+                }
             } catch (e: Exception) {
-                icon.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        context,
-                        R.drawable.ic_account_circle_grey_24dp
-                    )
-                )
+                try {
+                    val username = cursor.getStringOrNull(iconColumn)
+                    if (username != null) {
+                        AvatarLoader.load(context, icon, account, username)
+                    }
+                } catch (e: Exception) {
+                    icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_account_circle_grey_24dp))
+                }
             }
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 37388a116..8c7a60692 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -2,7 +2,6 @@
 
 
 import android.content.Context;
-import android.net.Uri;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -11,14 +10,12 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.owncloud.android.lib.resources.shares.OCShare;
 
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemShareShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 
@@ -65,12 +62,9 @@ public void bind(OCShare share,
             case USER:
                 binding.icon.setTag(share.getShareWith());
 
-                Glide.with(context)
-                        .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(share.getSharedWithDisplayName()) + "/64"))
-                        .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                        .error(R.drawable.ic_account_circle_grey_24dp)
-                        .apply(RequestOptions.circleCropTransform())
-                        .into(binding.icon);
+                if (share.getSharedWithDisplayName() != null) {
+                    AvatarLoader.INSTANCE.load(context, binding.icon, account, share.getSharedWithDisplayName());
+                }
 
                 // binding.icon.setOnClickListener(v -> listener.showProfileBottomSheet(user, share.getShareWith()));
             default:
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
index 5cf449263..eb80e83e7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/ProfileBottomSheetDialog.kt
@@ -9,17 +9,15 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.FragmentActivity
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.nextcloud.android.lib.resources.profile.Action
 import com.nextcloud.android.lib.resources.profile.HoverCard
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl
 import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetActionBinding
 import it.niedermann.owncloud.notes.databinding.ProfileBottomSheetFragmentBinding
 import it.niedermann.owncloud.notes.persistence.entity.Account
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
 
 /**
@@ -54,17 +52,7 @@ class ProfileBottomSheetDialog(
              binding.sharedWithYouUsername.setText(
                     String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
              */
-        Glide.with(fileActivity)
-            .load(
-                SingleSignOnUrl(
-                    account.accountName,
-                    account.url + "/index.php/avatar/" + Uri.encode(account.userName) + "/64"
-                )
-            )
-            .placeholder(R.drawable.ic_account_circle_grey_24dp)
-            .error(R.drawable.ic_account_circle_grey_24dp)
-            .apply(RequestOptions.circleCropTransform())
-            .into(binding.icon)
+        AvatarLoader.load(fileActivity, binding.icon, account)
 
         binding.displayName.text = hoverCard.displayName
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/AvatarLoader.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/AvatarLoader.kt
new file mode 100644
index 000000000..3270b4056
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/AvatarLoader.kt
@@ -0,0 +1,34 @@
+package it.niedermann.owncloud.notes.share.helper
+
+import android.content.Context
+import android.net.Uri
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.persistence.entity.Account
+
+object AvatarLoader {
+
+    fun load(context: Context, imageView: ImageView, account: Account) {
+        load(context, imageView, SingleSignOnUrl(account.accountName, account.avatarUrl))
+    }
+
+    fun load(context: Context, imageView: ImageView, account: Account, username: String) {
+        load(context, imageView, SingleSignOnUrl(account.accountName, getUrl(account.url, username)))
+    }
+
+    fun load(context: Context, imageView: ImageView, ssoURL: Any) {
+        Glide
+            .with(context)
+            .load(ssoURL)
+            .placeholder(R.drawable.ic_account_circle_grey_24dp)
+            .error(R.drawable.ic_account_circle_grey_24dp)
+            .apply(RequestOptions.circleCropTransform())
+            .into(imageView)
+    }
+
+    private fun getUrl(url: String, username: String): String =
+        url + "/index.php/avatar/" + Uri.encode(username) + "/64"
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index af675e696..a40dc8fc7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -13,7 +13,6 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.text.TextUtils;
 
 import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -156,18 +155,7 @@ public Cursor searchForUsersOrGroups(String userQuery, boolean isFederationShare
                         displayName = userName;
                         subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
                                 status.getMessage();
-                        Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
-
-                        builder.appendQueryParameter("shareWith", shareWith);
-                        builder.appendQueryParameter("displayName", displayName);
-                        builder.appendQueryParameter("status", status.getStatus().toString());
-
-                        if (!TextUtils.isEmpty(status.getIcon()) && !"null".equals(status.getIcon())) {
-                            builder.appendQueryParameter("icon", status.getIcon());
-                        }
-
-                        icon = builder.build().toString();
-
+                        icon = displayName;
                         dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
                         break;
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
index fbc04e79d..1804644ac 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
@@ -11,13 +11,9 @@
 import androidx.core.util.Consumer;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
-import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 
 public class AccountChooserViewHolder extends RecyclerView.ViewHolder {
     private final ItemAccountChooseBinding binding;
@@ -28,14 +24,7 @@ protected AccountChooserViewHolder(ItemAccountChooseBinding binding) {
     }
 
     public void bind(Account localAccount, Consumer<Account> targetAccountConsumer) {
-        Glide
-                .with(binding.accountItemAvatar.getContext())
-                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(localAccount.getUserName()) + "/64"))
-                .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.accountItemAvatar);
-
+        AvatarLoader.INSTANCE.load(binding.accountItemAvatar.getContext(), binding.accountItemAvatar, localAccount);
         binding.accountLayout.setOnClickListener((v) -> targetAccountConsumer.accept(localAccount));
         binding.accountName.setText(localAccount.getDisplayName());
         binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());

From 02116e90ff2be35aec0ca59ca2b27855e8e3ed17 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 15:41:20 +0100
Subject: [PATCH 062/138] use ScheduledExecutorService

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index b0f132b10..3b0328935 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -99,7 +99,7 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        new Thread(() -> {{
+        executorService.schedule(() -> {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
@@ -117,7 +117,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }}).start();
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override
@@ -482,7 +482,7 @@ public void refreshCapabilitiesFromDB() {
      * before reading database.
      */
     public void refreshSharesFromDB() {
-        new Thread(() -> {
+        executorService.schedule(() -> {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
@@ -528,8 +528,7 @@ public void refreshSharesFromDB() {
             } catch (Exception e) {
                 Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
             }
-        }).start();
-
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     private void checkContactPermission() {
@@ -625,7 +624,7 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        new Thread(() -> {{
+        executorService.schedule(() -> {
             final var result = repository.removeShare(share.getId());
 
             runOnUiThread(() -> {
@@ -640,7 +639,7 @@ public void unShare(OCShare share) {
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
                 }
             });
-        }}).start();
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override

From 66fd0b98a2459d1b997a010d647f5b757f6bd2bd Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 15:42:53 +0100
Subject: [PATCH 063/138] shutdown ScheduledExecutorService onDestroy

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 3b0328935..4958e4d27 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -718,4 +718,10 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
+
+    @Override
+    protected void onDestroy() {
+        executorService.shutdown();
+        super.onDestroy();
+    }
 }

From 2a2d0225469e7fa9f48f10ca1634e8eb5361edfc Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 15:51:17 +0100
Subject: [PATCH 064/138] remove unused codes

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 203 ++----------------
 .../share/adapter/ShareeListAdapter.java      |  16 --
 ...ileDetailSharingMenuBottomSheetDialog.java |   1 -
 .../notes/share/helper/SharingMenuHelper.java |  53 -----
 4 files changed, 12 insertions(+), 261 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 4958e4d27..4b4bc400a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,7 +14,6 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -29,7 +28,6 @@
 
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
@@ -54,7 +52,6 @@
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
-import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
@@ -135,23 +132,6 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
-        // TODO: When to disable?
-        // binding.pickContactEmailBtn.setVisibility(View.GONE);
-        // disableSearchView(binding.searchView);
-
-        /*
-        if (file.canReshare()) {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
-        } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-            binding.searchView.setInputType(InputType.TYPE_NULL);
-            binding.pickContactEmailBtn.setVisibility(View.GONE);
-            disableSearchView(binding.searchView);
-        }
-         */
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -253,16 +233,6 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
-    private void disableSearchView(View view) {
-        view.setEnabled(false);
-
-        if (view instanceof ViewGroup viewGroup) {
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                disableSearchView(viewGroup.getChildAt(i));
-            }
-        }
-    }
-
     // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
         String noteId = String.valueOf(note.getAccountId());
@@ -272,37 +242,9 @@ private boolean accountOwnsFile() {
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
-        } else {
-
-            /*
-            // TODO: How to get owner display name from note?
-
-             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
-             */
-
-
-            loadAvatar();
-
-            /*
-            // TODO: Note's note?
-            String note = file.getNote();
-
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
-            }
-             */
         }
     }
 
-    private void loadAvatar() {
-        AvatarLoader.INSTANCE.load(this, binding.sharedWithYouAvatar, account);
-        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
-    }
-
     public void copyInternalLink() {
         if (account == null) {
             DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
@@ -312,6 +254,16 @@ public void copyInternalLink() {
         showShareLinkDialog();
     }
 
+    @Override
+    public void createPublicShareLink() {
+
+    }
+
+    @Override
+    public void createSecureFileDrop() {
+
+    }
+
     private void showShareLinkDialog() {
         String link = createInternalLink();
 
@@ -331,79 +283,9 @@ private String createInternalLink() {
         return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
-    // TODO: Capabilities in notes app doesn't have following functions...
-    public void createPublicShareLink() {
-        /*
-        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
-            // Is CreateShareViaLink operation compatible?
-
-            Intent service = new Intent(fileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
-            if (!TextUtils.isEmpty(password)) {
-                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            }
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-        }
-         */
-    }
-
-    public void createSecureFileDrop() {
-        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
-    }
-
-    /*
-    // TODO: Cant call getFileWithLink
-
-     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
-        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
-                                                                                       ShareType.PUBLIC_LINK,
-                                                                                       "");
-
-        if (shares.size() == SINGLE_LINK_SIZE) {
-            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
-        } else {
-            if (fileActivity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
-            } else {
-                showShareFile(file);
-            }
-        }
-
-        fileActivity.refreshList();
-    }
-     */
-    private void showSendLinkTo(OCShare publicShare) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(publicShare.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                // TODO: get link from public share and pass to the function
-                showShareLinkDialog();
-            }
-        }
-         */
-    }
-
+    @Override
     public void copyLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(share.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
-            }
-        }
-         */
+
     }
 
     @Override
@@ -418,38 +300,6 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
-    public void onUpdateShareInformation(RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            refreshUiFromDB();
-        } else {
-            setupView();
-        }
-    }
-
-    /**
-     * Get {@link OCShare} instance from DB and updates the UI.
-     */
-    private void refreshUiFromDB() {
-        refreshSharesFromDB();
-        // Updates UI with new state
-        setupView();
-    }
-
-
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
-     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
-     * @param askForPassword if true, password is optional
-     */
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
-                createShare,
-                askForPassword);
-        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
@@ -458,29 +308,11 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
 
     @Override
     public void showProfileBottomSheet(Account account, String shareWith) {
-        // TODO:
-        /*
-        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            new RetrieveHoverCardAsyncTask(user,
-                    account,
-                    shareWith,
-                    this,
-                    clientFactory).execute();
-        }
-         */
     }
 
-    /**
-     * Get known server capabilities from DB
-     */
     public void refreshCapabilitiesFromDB() {
-        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
-    /**
-     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
-     * before reading database.
-     */
     public void refreshSharesFromDB() {
         executorService.schedule(() -> {
             try {
@@ -599,10 +431,8 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putSerializable(ARG_ACCOUNT, account);
     }
 
-    // TODO: capabilities needed
     private boolean isReshareForbidden(OCShare share) {
         return false;
-        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -644,13 +474,6 @@ public void unShare(OCShare share) {
 
     @Override
     public void sendLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
-            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
-        } else {
-            showSendLinkTo(share);
-        }
-         */
     }
 
     @Override
@@ -676,7 +499,6 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
     }
 
-    //launcher for contact permission
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
@@ -687,7 +509,6 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 }
             });
 
-    //launcher to handle contact selection
     private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                     result -> {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index eaca06b8e..656fe6594 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -2,10 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -124,20 +122,6 @@ public void addShares(List<OCShare> sharesToAdd) {
         notifyDataSetChanged();
     }
 
-    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
-        if (callContext instanceof ImageView iv) {
-            iv.setImageDrawable(avatarDrawable);
-        }
-    }
-
-    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
-        if (callContext instanceof ImageView iv) {
-            // needs to be changed once federated users have avatars
-            return String.valueOf(iv.getTag()).equals(tag.split("@")[0]);
-        }
-        return false;
-    }
-
     @SuppressLint("NotifyDataSetChanged")
     public void remove(OCShare share) {
         shares.remove(share);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
index 9dacd8118..1f0f2c3fc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
@@ -50,7 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
         viewThemeUtils.platform.colorImageView(binding.menuIconSendNewEmail);
          */
 
-
         updateUI();
 
         setupClickListener();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
index a86b47175..f9723a9fd 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/SharingMenuHelper.java
@@ -9,14 +9,9 @@
 import static com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.view.MenuItem;
 
 import com.owncloud.android.lib.resources.shares.OCShare;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import it.niedermann.owncloud.notes.R;
 
 /**
@@ -28,54 +23,6 @@ private SharingMenuHelper() {
         // utility class -> private constructor
     }
 
-    /**
-     * Sets checked/visibility state on the given {@link MenuItem} based on the given criteria.
-     *
-     * @param menuItem the {@link MenuItem} to be setup
-     */
-    public static void setupHideFileDownload(MenuItem menuItem,
-                                             boolean hideFileDownload,
-                                             boolean isFileDrop) {
-        if (isFileDrop) {
-            menuItem.setVisible(false);
-        } else {
-            menuItem.setVisible(true);
-            menuItem.setChecked(hideFileDownload);
-        }
-    }
-
-    /**
-     * sets up the password {@link MenuItem}'s title based on the fact if a password is present.
-     *
-     * @param password            the password {@link MenuItem}
-     * @param isPasswordProtected flag is a password is present
-     */
-    public static void setupPasswordMenuItem(MenuItem password, boolean isPasswordProtected) {
-        if (isPasswordProtected) {
-            password.setTitle(R.string.share_password_title);
-        } else {
-            password.setTitle(R.string.share_no_password_title);
-        }
-    }
-
-    /**
-     * sets up the expiration date {@link MenuItem}'s title based on the fact if an expiration date is present.
-     *
-     * @param expirationDate      the expiration date {@link MenuItem}
-     * @param expirationDateValue the expiration date
-     * @param res                 Resources to load the corresponding strings.
-     */
-    public static void setupExpirationDateMenuItem(MenuItem expirationDate, long expirationDateValue, Resources res) {
-        if (expirationDateValue > 0) {
-            expirationDate.setTitle(res.getString(
-                    R.string.share_expiration_date_label,
-                    SimpleDateFormat.getDateInstance().format(new Date(expirationDateValue))
-            ));
-        } else {
-            expirationDate.setTitle(R.string.share_no_expiration_date_label);
-        }
-    }
-
     public static boolean isUploadAndEditingAllowed(OCShare share) {
         if (share.getPermissions() == NO_PERMISSION) {
             return false;

From de64c43a2f1b7b74b8055aa477bdaf7bbf4f6992 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 15:58:10 +0100
Subject: [PATCH 065/138] BrandedBottomSheetDialog

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../branding/BrandedBottomSheetDialog.kt      | 15 ++++++
 .../notes/share/NoteShareActivity.java        |  8 +--
 ...vityShareItemActionBottomSheetDialog.java} | 49 ++++++++++---------
 ...tActions.java => NoteShareItemAction.java} |  2 +-
 ...ragment.xml => item_note_share_action.xml} |  0
 5 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedBottomSheetDialog.kt
 rename app/src/main/java/it/niedermann/owncloud/notes/share/dialog/{FileDetailSharingMenuBottomSheetDialog.java => NoteShareActivityShareItemActionBottomSheetDialog.java} (63%)
 rename app/src/main/java/it/niedermann/owncloud/notes/share/listener/{FileDetailsSharingMenuBottomSheetActions.java => NoteShareItemAction.java} (92%)
 rename app/src/main/res/layout/{file_details_sharing_menu_bottom_sheet_fragment.xml => item_note_share_action.xml} (100%)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedBottomSheetDialog.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedBottomSheetDialog.kt
new file mode 100644
index 000000000..0aed84b85
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedBottomSheetDialog.kt
@@ -0,0 +1,15 @@
+package it.niedermann.owncloud.notes.branding
+
+import android.content.Context
+import androidx.annotation.ColorInt
+import com.google.android.material.bottomsheet.BottomSheetDialog
+
+abstract class BrandedBottomSheetDialog(context: Context) : BottomSheetDialog(context), Branded {
+
+    override fun onStart() {
+        super.onStart()
+
+        @ColorInt val color = BrandingUtil.readBrandMainColor(context)
+        applyBrand(color)
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 4b4bc400a..0688d99ec 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -48,12 +48,12 @@
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
-import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.NoteShareActivityShareItemActionBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
@@ -61,7 +61,7 @@
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -291,7 +291,7 @@ public void copyLink(OCShare share) {
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
         if (!this.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
+            new NoteShareActivityShareItemActionBottomSheetDialog(this, this, share).show();
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
similarity index 63%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
index 1f0f2c3fc..5bb6d3563 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/FileDetailSharingMenuBottomSheetDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
@@ -7,24 +7,23 @@
 import android.view.ViewGroup;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
-import it.niedermann.owncloud.notes.databinding.FileDetailsSharingMenuBottomSheetFragmentBinding;
+import it.niedermann.owncloud.notes.branding.BrandedBottomSheetDialog;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
+import it.niedermann.owncloud.notes.databinding.ItemNoteShareActionBinding;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
-
-/**
- * File Details Sharing option menus {@link android.app.Dialog} styled as a bottom sheet for main actions.
- */
-public class FileDetailSharingMenuBottomSheetDialog extends BottomSheetDialog {
-    private FileDetailsSharingMenuBottomSheetFragmentBinding binding;
-    private final FileDetailsSharingMenuBottomSheetActions actions;
+import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
+
+public class NoteShareActivityShareItemActionBottomSheetDialog extends BrandedBottomSheetDialog {
+    private ItemNoteShareActionBinding binding;
+    private final NoteShareItemAction actions;
     private final OCShare ocShare;
-    public FileDetailSharingMenuBottomSheetDialog(Activity activity,
-                                                  FileDetailsSharingMenuBottomSheetActions actions,
-                                                  OCShare ocShare) {
+    public NoteShareActivityShareItemActionBottomSheetDialog(Activity activity,
+                                                             NoteShareItemAction actions,
+                                                             OCShare ocShare) {
         super(activity);
         this.actions = actions;
         this.ocShare = ocShare;
@@ -33,23 +32,13 @@ public FileDetailSharingMenuBottomSheetDialog(Activity activity,
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = FileDetailsSharingMenuBottomSheetFragmentBinding.inflate(getLayoutInflater());
+        binding = ItemNoteShareActionBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getWindow() != null) {
             getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         }
 
-        /*
-         viewThemeUtils.platform.themeDialog(binding.getRoot());
-
-        viewThemeUtils.platform.colorImageView(binding.menuIconAddAnotherLink);
-        viewThemeUtils.platform.colorImageView(binding.menuIconAdvancedPermissions);
-        viewThemeUtils.platform.colorImageView(binding.menuIconSendLink);
-        viewThemeUtils.platform.colorImageView(binding.menuIconUnshare);
-        viewThemeUtils.platform.colorImageView(binding.menuIconSendNewEmail);
-         */
-
         updateUI();
 
         setupClickListener();
@@ -107,4 +96,16 @@ protected void onStop() {
         super.onStop();
         binding = null;
     }
+
+    @Override
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, getContext());
+        util.platform.themeDialog(binding.getRoot());
+
+        util.platform.colorImageView(binding.menuIconAddAnotherLink, ColorRole.PRIMARY);
+        util.platform.colorImageView(binding.menuIconAdvancedPermissions, ColorRole.PRIMARY);
+        util.platform.colorImageView(binding.menuIconSendLink, ColorRole.PRIMARY);
+        util.platform.colorImageView(binding.menuIconUnshare, ColorRole.PRIMARY);
+        util.platform.colorImageView(binding.menuIconSendNewEmail, ColorRole.PRIMARY);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/NoteShareItemAction.java
similarity index 92%
rename from app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java
rename to app/src/main/java/it/niedermann/owncloud/notes/share/listener/NoteShareItemAction.java
index a804511c4..24fa5bad6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/listener/FileDetailsSharingMenuBottomSheetActions.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/listener/NoteShareItemAction.java
@@ -3,7 +3,7 @@
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
-public interface FileDetailsSharingMenuBottomSheetActions {
+public interface NoteShareItemAction {
 
     /**
      * open advanced permission for selected share
diff --git a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml b/app/src/main/res/layout/item_note_share_action.xml
similarity index 100%
rename from app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
rename to app/src/main/res/layout/item_note_share_action.xml

From 502a058b0e77e7dbc8b5b2f54e8554508721dd75 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 16:10:50 +0100
Subject: [PATCH 066/138] BrandedViewHolder

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/branding/BrandedViewHolder.kt         | 13 +++++++++++++
 .../adapter/holder/LinkShareViewHolder.java     | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedViewHolder.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedViewHolder.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedViewHolder.kt
new file mode 100644
index 000000000..6804bfae7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedViewHolder.kt
@@ -0,0 +1,13 @@
+package it.niedermann.owncloud.notes.branding
+
+import android.view.View
+import androidx.annotation.ColorInt
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class BrandedViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Branded {
+
+    fun bindBranding() {
+        @ColorInt val color = BrandingUtil.readBrandMainColor(itemView.context)
+        applyBrand(color)
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
index 9253f8c8c..daecc2cc1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
@@ -7,28 +7,31 @@
 
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedViewHolder;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 
-public class LinkShareViewHolder extends RecyclerView.ViewHolder {
+public class LinkShareViewHolder extends BrandedViewHolder {
     private ItemShareLinkShareBinding binding;
     private Context context;
 
     public LinkShareViewHolder(@NonNull View itemView) {
         super(itemView);
+        bindBranding();
     }
 
     public LinkShareViewHolder(ItemShareLinkShareBinding binding, Context context) {
         this(binding.getRoot());
         this.binding = binding;
         this.context = context;
+        bindBranding();
     }
 
     public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
@@ -54,8 +57,6 @@ public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
                     binding.name.setText(R.string.share_link);
                 }
             }
-
-            // viewThemeUtils.platform.colorImageViewBackgroundAndIcon(binding.icon);
         }
 
         binding.subline.setVisibility(View.GONE);
@@ -75,9 +76,15 @@ private void setPermissionName(OCShare publicShare, String permissionName) {
         if (!TextUtils.isEmpty(permissionName) && !SharingMenuHelper.isSecureFileDrop(publicShare)) {
             binding.permissionName.setText(permissionName);
             binding.permissionName.setVisibility(View.VISIBLE);
-            // viewThemeUtils.androidx.colorPrimaryTextViewElement(binding.permissionName);
         } else {
             binding.permissionName.setVisibility(View.GONE);
         }
     }
+
+    @Override
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, context);
+        util.androidx.colorPrimaryTextViewElement(binding.permissionName);
+        util.platform.colorImageViewBackgroundAndIcon(binding.icon);
+    }
 }

From 00ba5f9fac8ca7f854f173c912ebcbc062962521 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 16:21:43 +0100
Subject: [PATCH 067/138] fix colors

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/adapter/ShareeListAdapter.java      | 5 ++++-
 app/src/main/res/layout/activity_note_share_detail.xml       | 4 ++--
 app/src/main/res/layout/item_note_share.xml                  | 4 ++--
 app/src/main/res/layout/item_notes_list_note_item_grid.xml   | 2 +-
 app/src/main/res/layout/item_quick_share_permissions.xml     | 2 +-
 app/src/main/res/layout/item_share_link_share.xml            | 4 ++--
 app/src/main/res/layout/item_share_share.xml                 | 4 ++--
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 656fe6594..79b5c1021 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -63,13 +63,16 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                                 false),
                         activity);
             }
-            case NEW_PUBLIC_LINK -> {
+            /*
+             case NEW_PUBLIC_LINK -> {
                 return new NewLinkShareViewHolder(
                         ItemAddPublicShareBinding.inflate(LayoutInflater.from(activity),
                                 parent,
                                 false)
                 );
             }
+             */
+
             case INTERNAL -> {
                 return new InternalShareViewHolder(
                         ItemInternalShareLinkBinding.inflate(LayoutInflater.from(activity), parent, false),
diff --git a/app/src/main/res/layout/activity_note_share_detail.xml b/app/src/main/res/layout/activity_note_share_detail.xml
index 8adc2e5cb..f412c1d13 100644
--- a/app/src/main/res/layout/activity_note_share_detail.xml
+++ b/app/src/main/res/layout/activity_note_share_detail.xml
@@ -35,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/share_permissions"
-                android:textColor="@color/primary"
+                android:textColor="@color/defaultBrand"
                 android:textStyle="bold" />
 
             <RadioGroup
@@ -73,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacer_2x"
                 android:text="@string/note_share_detail_activity_advanced_settings"
-                android:textColor="@color/primary"
+                android:textColor="@color/defaultBrand"
                 android:textStyle="bold"/>
 
             <com.google.android.material.checkbox.MaterialCheckBox
diff --git a/app/src/main/res/layout/item_note_share.xml b/app/src/main/res/layout/item_note_share.xml
index b5a6eadb5..d0423af00 100644
--- a/app/src/main/res/layout/item_note_share.xml
+++ b/app/src/main/res/layout/item_note_share.xml
@@ -69,9 +69,9 @@
             android:singleLine="true"
             tools:text="View only"
             app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            app:drawableTint="@color/primary"
+            app:drawableTint="@color/defaultBrand"
             app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            android:textColor="@color/primary"
+            android:textColor="@color/defaultBrand"
             android:textSize="@dimen/note_font_size_minimum" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
index 5b842046b..77c1ef076 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
@@ -95,7 +95,7 @@
                     android:padding="@dimen/spacer_1hx"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/secondary_font_size"
-                    app:chipBackgroundColor="@color/primary"
+                    app:chipBackgroundColor="@color/defaultBrand"
                     app:chipEndPadding="@dimen/spacer_1x"
                     app:chipMinHeight="0dp"
                     app:chipStartPadding="@dimen/spacer_1x"
diff --git a/app/src/main/res/layout/item_quick_share_permissions.xml b/app/src/main/res/layout/item_quick_share_permissions.xml
index a22c075e1..bd2cf72ef 100644
--- a/app/src/main/res/layout/item_quick_share_permissions.xml
+++ b/app/src/main/res/layout/item_quick_share_permissions.xml
@@ -23,7 +23,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/primary" />
+        app:tint="@color/defaultBrand" />
 
     <TextView
         android:id="@+id/tv_quick_share_name"
diff --git a/app/src/main/res/layout/item_share_link_share.xml b/app/src/main/res/layout/item_share_link_share.xml
index 6f558b7db..0d9b9d833 100644
--- a/app/src/main/res/layout/item_share_link_share.xml
+++ b/app/src/main/res/layout/item_share_link_share.xml
@@ -69,9 +69,9 @@
             android:singleLine="true"
             tools:text="View only"
             app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            app:drawableTint="@color/primary"
+            app:drawableTint="@color/defaultBrand"
             app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            android:textColor="@color/primary"
+            android:textColor="@color/defaultBrand"
             android:textSize="@dimen/note_font_size_minimum" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_share_share.xml b/app/src/main/res/layout/item_share_share.xml
index a18cbdfd4..108afe34e 100644
--- a/app/src/main/res/layout/item_share_share.xml
+++ b/app/src/main/res/layout/item_share_share.xml
@@ -55,11 +55,11 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textColor="@color/primary"
+            android:textColor="@color/defaultBrand"
             android:textSize="@dimen/note_font_size_minimum"
             app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
             app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            app:drawableTint="@color/primary"
+            app:drawableTint="@color/defaultBrand"
             tools:text="View only" />
     </LinearLayout>
 

From a44bc82457022445e9e7454941f175dca95b6c28 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 16:42:45 +0100
Subject: [PATCH 068/138] add ARG_EXP_DATE_SHOWN

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  7 +++
 .../notes/share/NoteShareActivity.java        | 21 ++++++++-
 .../notes/share/repository/ShareRepository.kt | 46 ++++++++++++++++---
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 5f845706f..60b55b53d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -33,6 +33,13 @@ interface ShareAPI {
         @Query("include_tags") includeTags: Boolean = true,
     ): Call<OcsResponse<List<CreateShareResponse>>>
 
+    @GET("shares/?format=json")
+    fun getSharesForSpecificNote(
+        @Query("path") path: String,
+        @Query("reshares") reshares: Boolean = true,
+        @Query("subfiles") subfiles: Boolean = true
+    ): Call<Any>
+
     @DELETE("shares/{shareId}?format=json")
     fun removeShare(@Path("shareId") shareId: Long): Call<Any>
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 0688d99ec..206c22df9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -101,6 +101,9 @@ private void initializeArguments() {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
 
+                // FIXME:
+                repository.getSharesForSpecificNote(note);
+
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
                     binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
@@ -487,13 +490,29 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
         bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
         bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
         bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
-        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, getExpDateShown());
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
         startActivity(intent);
     }
 
+    private boolean getExpDateShown() {
+        try {
+            final var capabilities = repository.capabilities();
+            final var majorVersionAsString = capabilities.getNextcloudMajorVersion();
+            if (majorVersionAsString != null) {
+                final var majorVersion = Integer.parseInt(majorVersionAsString);
+                return majorVersion >= 18;
+            }
+
+            return false;
+        } catch (NumberFormatException e) {
+            Log_OC.d(TAG, "Exception while getting expDateShown");
+            return false;
+        }
+    }
+
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 3eb6c18ed..ae5809630 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -41,6 +41,33 @@ class ShareRepository(private val applicationContext: Context, private val accou
         return notesRepository.getShareEntities(noteRemoteId, userName)
     }
 
+    // TODO: Needed for ShareeListAdapter. If ShareEntity is empty this method is needed to fetch shares
+    //  "statuscode":400,"message":"Not a directory"},"data":[]} e.g. remotePath = /Notes/NETOSSSss.md
+    fun getSharesForSpecificNote(note: Note): Boolean {
+        val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
+        val notesPathResponse = notesPathCall.execute()
+        val notesPathResponseResult = notesPathResponse.body() ?: return false
+        val notesPath = notesPathResponseResult.notesPath
+        val notesSuffix = notesPathResponseResult.fileSuffix
+        val remotePath =  "/" + notesPath + "/" + note.title + notesSuffix
+
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val call = shareAPI.getSharesForSpecificNote(remotePath)
+        val response = call.execute()
+
+        return try {
+            if (response.isSuccessful) {
+                true
+            } else {
+                Log_OC.d(tag, "Failed to getSharesForSpecificNote: ${response.errorBody()?.string()}")
+                false
+            }
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while getSharesForSpecificNote: $e")
+            false
+        }
+    }
+
     fun getSharees(
         searchString: String,
         page: Int,
@@ -198,13 +225,18 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.addShare(request = requestBody)
         val response = call.execute()
-        return if (response.isSuccessful) {
-            val createShareResponse = response.body()
-            Log_OC.d(tag, "Response successful: $createShareResponse")
-            createShareResponse?.ocs?.data
-        } else {
-            val errorBody = response.errorBody()?.string()
-            Log_OC.d(tag, "Response failed:$errorBody")
+        return try {
+            if (response.isSuccessful) {
+                val createShareResponse = response.body()
+                Log_OC.d(tag, "Response successful: $createShareResponse")
+                createShareResponse?.ocs?.data
+            } else {
+                val errorBody = response.errorBody()?.string()
+                Log_OC.d(tag, "Response failed: $errorBody")
+                null
+            }
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while creating share", e)
             null
         }
     }

From 933486d4a97eb80479ed09c8f6c9c37c51c8ddff Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 4 Feb 2025 16:43:56 +0100
Subject: [PATCH 069/138] add TODOs

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/repository/ShareRepository.kt           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index ae5809630..7cf548208 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -179,6 +179,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    // TODO: {"ocs":{"meta":{"status":"failure","statuscode":404,"message":"Cannot increase permissions of /Notes/NETOSSSss.md"},"data":[]}}
     fun updateShare(shareId: Long, requestBody: UpdateShareRequest): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.updateShare(shareId, requestBody)

From 64ec92d67ee192cf3e702a52053a0f1767241d2c Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 09:12:30 +0100
Subject: [PATCH 070/138] fix updateShare

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt | 2 +-
 .../owncloud/notes/share/model/UpdateShareRequest.kt           | 2 +-
 .../owncloud/notes/share/repository/ShareRepository.kt         | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 0a14dad0f..f8d712ccc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -552,7 +552,7 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         val requestBody = UpdateShareRequest(
             share_id = share!!.id.toInt(),
-            permissions = permission,
+            permissions = if (permission == -1) null else permission,
             password = password,
             publicUpload = "false",
             expireDate = getExpirationDate(),
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
index 23f96ef4d..e0b2a9628 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -7,7 +7,7 @@ data class UpdateShareRequest(
     val share_id: Int,
 
     @Expose
-    val permissions: Int,
+    val permissions: Int?,
 
     @Expose
     val password: String,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 7cf548208..b3f6f2249 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -179,14 +179,13 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    // TODO: {"ocs":{"meta":{"status":"failure","statuscode":404,"message":"Cannot increase permissions of /Notes/NETOSSSss.md"},"data":[]}}
     fun updateShare(shareId: Long, requestBody: UpdateShareRequest): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.updateShare(shareId, requestBody)
         val response = call.execute()
         return try {
             if (response.isSuccessful) {
-                Log_OC.d(tag, "Share updated successfully: ${response.body()}")
+                Log_OC.d(tag, "Share updated successfully: ${response.body().toString()}")
             } else {
                 Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
             }

From dcbd41a6f548833e25121544ff3bd04afeb943f4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 11:37:32 +0100
Subject: [PATCH 071/138] fix getSharesForNotesAndSaveShareEntities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/NotesRepository.java    |  8 +--
 .../notes/persistence/dao/ShareDao.kt         | 10 +--
 .../notes/persistence/entity/ShareEntity.kt   | 11 ++-
 .../notes/persistence/sync/ShareAPI.kt        |  2 +-
 .../notes/share/NoteShareActivity.java        |  8 +--
 .../notes/share/NoteShareDetailActivity.kt    |  4 +-
 .../notes/share/repository/ShareRepository.kt | 67 ++++++++++++++-----
 7 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 37c52d5cb..11a0ffa00 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -967,11 +967,11 @@ public void updateDisplayName(long id, @Nullable String displayName) {
         db.getAccountDao().updateDisplayName(id, displayName);
     }
 
-    public void addShareEntity(ShareEntity entity) {
-        db.getShareDao().addShareEntity(entity);
+    public void addShareEntities(List<ShareEntity> entities) {
+        db.getShareDao().addShareEntities(entities);
     }
 
-    public List<ShareEntity> getShareEntities(long noteRemoteId, String userName) {
-        return db.getShareDao().getShareEntities(noteRemoteId, userName);
+    public List<ShareEntity> getShareEntities(String path) {
+        return db.getShareDao().getShareEntities(path);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 97f27cac0..15ab98f80 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Insert
-    fun addShareEntity(entity: ShareEntity)
-
-    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
-    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
+    @Query("SELECT * FROM share_table WHERE path = :path")
+    fun getShareEntities(path: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
index 8e05c5a9f..4d0f226f4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
@@ -9,6 +9,13 @@ data class ShareEntity(
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "id")
     val id: Int? = null,
-    val noteRemoteId: Long,
-    val userName: String
+    val note: String? = null,
+    val path: String? = null,
+    val file_target: String? = null,
+    val share_with: String? = null,
+    val share_with_displayname: String? = null,
+    val uid_file_owner: String? = null,
+    val displayname_file_owner: String? = null,
+    val uid_owner: String? = null,
+    val displayname_owner: String? = null,
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 60b55b53d..03096439f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -38,7 +38,7 @@ interface ShareAPI {
         @Query("path") path: String,
         @Query("reshares") reshares: Boolean = true,
         @Query("subfiles") subfiles: Boolean = true
-    ): Call<Any>
+    ): LinkedTreeMap<String, Any?>?
 
     @DELETE("shares/{shareId}?format=json")
     fun removeShare(@Path("shareId") shareId: Long): Call<Any>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 206c22df9..96d31e8fe 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -100,9 +100,7 @@ private void initializeArguments() {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
-
-                // FIXME:
-                repository.getSharesForSpecificNote(note);
+                repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
@@ -332,8 +330,8 @@ public void refreshSharesFromDB() {
                 // to show share with users/groups info
                 List<OCShare> shares = new ArrayList<>();
 
-                if (note != null && note.getRemoteId() != null) {
-                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
+                if (note != null) {
+                    final var shareEntities = repository.getShareEntities(note);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index f8d712ccc..d9ad6f254 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -596,9 +596,7 @@ class NoteShareDetailActivity : BrandedActivity(),
         )
 
         if (result != null) {
-            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
-            val entity = ShareEntity(result.id.toInt(), note?.remoteId!!, ssoAcc.name)
-            repository.addShareEntity(entity)
+            repository.getSharesForNotesAndSaveShareEntities()
         }
 
         handleResult(result != null)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index b3f6f2249..6773b72a9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -19,8 +19,6 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.json.JSONObject
 
 class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
@@ -33,33 +31,70 @@ class ShareRepository(private val applicationContext: Context, private val accou
         )
     }
 
-    suspend fun addShareEntity(entity: ShareEntity) = withContext(Dispatchers.IO) {
-        notesRepository.addShareEntity(entity)
+    private fun getNotePath(note: Note): String? {
+        val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
+        val notesPathResponse = notesPathCall.execute()
+        val notesPathResponseResult = notesPathResponse.body() ?: return null
+        val notesPath = notesPathResponseResult.notesPath
+        val notesSuffix = notesPathResponseResult.fileSuffix
+        return  "/" + notesPath + "/" + note.title + notesSuffix
     }
 
-    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity> {
-        return notesRepository.getShareEntities(noteRemoteId, userName)
+    fun getShareEntities(note: Note): List<ShareEntity> {
+        val path = getNotePath(note)
+        return notesRepository.getShareEntities(path)
     }
 
-    // TODO: Needed for ShareeListAdapter. If ShareEntity is empty this method is needed to fetch shares
-    //  "statuscode":400,"message":"Not a directory"},"data":[]} e.g. remotePath = /Notes/NETOSSSss.md
-    fun getSharesForSpecificNote(note: Note): Boolean {
+    fun getSharesForNotesAndSaveShareEntities(): Boolean {
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
         val notesPathResponseResult = notesPathResponse.body() ?: return false
         val notesPath = notesPathResponseResult.notesPath
-        val notesSuffix = notesPathResponseResult.fileSuffix
-        val remotePath =  "/" + notesPath + "/" + note.title + notesSuffix
+        val remotePath = "/$notesPath"
 
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.getSharesForSpecificNote(remotePath)
-        val response = call.execute()
+        val entities = arrayListOf<ShareEntity>()
 
         return try {
-            if (response.isSuccessful) {
+            if (call != null) {
+                val respOCS = call["ocs"] as? LinkedTreeMap<*, *>
+                val respData = respOCS?.getList("data")
+                respData?.forEach { data  ->
+                    val map = data as? LinkedTreeMap<*, *>
+                    val id = map?.get("id") as? String
+                    val note = map?.get("note") as? String
+                    val path = map?.get("path") as? String
+                    val fileTarget = map?.get("file_target") as? String
+                    val shareWith = map?.get("share_with") as? String
+                    val shareWithDisplayName = map?.get("share_with_displayname") as? String
+                    val uidFileOwner = map?.get("uid_file_owner") as? String
+                    val displayNameFileOwner = map?.get("displayname_file_owner") as? String
+                    val uidOwner = map?.get("uid_owner") as? String
+                    val displayNameOwner = map?.get("displayname_owner") as? String
+
+                    id?.toInt()?.let {
+                        val entity = ShareEntity(
+                            id = it,
+                            note = note,
+                            path = path,
+                            file_target = fileTarget,
+                            share_with = shareWith,
+                            share_with_displayname = shareWithDisplayName,
+                            uid_file_owner = uidFileOwner,
+                            displayname_file_owner = displayNameFileOwner,
+                            uid_owner = uidOwner,
+                            displayname_owner = displayNameOwner
+                        )
+
+                        entities.add(entity)
+                    }
+                }
+
+                notesRepository.addShareEntities(entities)
+
                 true
             } else {
-                Log_OC.d(tag, "Failed to getSharesForSpecificNote: ${response.errorBody()?.string()}")
                 false
             }
         } catch (e: Exception) {
@@ -68,6 +103,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    private fun LinkedTreeMap<*, *>.getList(key: String): ArrayList<*>? = this[key] as? ArrayList<*>
+
     fun getSharees(
         searchString: String,
         page: Int,
@@ -80,8 +117,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val respData = respOCS?.get("data") as? LinkedTreeMap<*, *>
             val respExact = respData?.get("exact") as? LinkedTreeMap<*, *>
 
-            fun LinkedTreeMap<*, *>.getList(key: String): ArrayList<*>? = this[key] as? ArrayList<*>
-
             val respExactUsers = respExact?.getList("users")
             val respExactGroups = respExact?.getList("groups")
             val respExactRemotes = respExact?.getList("remotes")

From ba15c67b5651927a95b4b9679f2a135f102a7b2b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 11:43:55 +0100
Subject: [PATCH 072/138] fix getSharesForNotesAndSaveShareEntities

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        |  3 +--
 .../notes/share/repository/ShareRepository.kt | 24 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 96d31e8fe..6b27591c3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -317,7 +317,6 @@ public void refreshCapabilitiesFromDB() {
     public void refreshSharesFromDB() {
         executorService.schedule(() -> {
             try {
-                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
@@ -331,7 +330,7 @@ public void refreshSharesFromDB() {
                 List<OCShare> shares = new ArrayList<>();
 
                 if (note != null) {
-                    final var shareEntities = repository.getShareEntities(note);
+                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 6773b72a9..2a85fcb97 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -19,6 +19,7 @@ import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
+import it.niedermann.owncloud.notes.shared.model.NotesSettings
 import org.json.JSONObject
 
 class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
@@ -31,24 +32,26 @@ class ShareRepository(private val applicationContext: Context, private val accou
         )
     }
 
-    private fun getNotePath(note: Note): String? {
+    private fun getNotesPathResponseResult(): NotesSettings? {
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return null
+        return notesPathResponse.body()
+    }
+
+    private fun getNotePath(note: Note): String? {
+        val notesPathResponseResult = getNotesPathResponseResult() ?: return null
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
         return  "/" + notesPath + "/" + note.title + notesSuffix
     }
 
-    fun getShareEntities(note: Note): List<ShareEntity> {
+    fun getShareEntitiesForSpecificNote(note: Note): List<ShareEntity> {
         val path = getNotePath(note)
         return notesRepository.getShareEntities(path)
     }
 
-    fun getSharesForNotesAndSaveShareEntities(): Boolean {
-        val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
-        val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return false
+    fun getSharesForNotesAndSaveShareEntities() {
+        val notesPathResponseResult = getNotesPathResponseResult() ?: return
         val notesPath = notesPathResponseResult.notesPath
         val remotePath = "/$notesPath"
 
@@ -56,7 +59,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val call = shareAPI.getSharesForSpecificNote(remotePath)
         val entities = arrayListOf<ShareEntity>()
 
-        return try {
+        try {
             if (call != null) {
                 val respOCS = call["ocs"] as? LinkedTreeMap<*, *>
                 val respData = respOCS?.getList("data")
@@ -92,14 +95,9 @@ class ShareRepository(private val applicationContext: Context, private val accou
                 }
 
                 notesRepository.addShareEntities(entities)
-
-                true
-            } else {
-                false
             }
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while getSharesForSpecificNote: $e")
-            false
         }
     }
 

From be3b1592408bdbfee369749190a9afd77ee5a1ef Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 11:52:09 +0100
Subject: [PATCH 073/138] fix duplicated items

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 22 ++++++++++---------
 .../model/CreateShareResponseExtensions.kt    |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 6b27591c3..ab51ce336 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -345,17 +345,19 @@ public void refreshSharesFromDB() {
                     adapter.addShares(shares);
 
                     // TODO: Will be added later on...
-                    List<OCShare> publicShares = new ArrayList<>();
-
-                    if (containsNoNewPublicShare(adapter.getShares())) {
-                        final OCShare ocShare = new OCShare();
-                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-                        publicShares.add(ocShare);
-                    } else {
-                        adapter.removeNewPublicShare();
-                    }
+                    /*
+                         List<OCShare> publicShares = new ArrayList<>();
+
+                        if (containsNoNewPublicShare(adapter.getShares())) {
+                            final OCShare ocShare = new OCShare();
+                            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+                            publicShares.add(ocShare);
+                        } else {
+                            adapter.removeNewPublicShare();
+                        }
 
-                    adapter.addShares(publicShares);
+                        adapter.addShares(publicShares);
+                     */
                 });
             } catch (Exception e) {
                 Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
index 23cc39595..c3646c4ff 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -6,7 +6,7 @@ import com.owncloud.android.lib.resources.shares.ShareType
 fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
     return map { response ->
         OCShare().apply {
-            id = response.id.toLongOrNull() ?: 0
+            id = response.id.toLongOrNull() ?: -1L
             fileSource = response.fileSource
             itemSource = response.itemSource
             shareType = when (response.shareType) {
@@ -32,5 +32,5 @@ fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
             mimetype = response.mimetype
             ownerDisplayName = response.displaynameOwner
         }
-    }
+    }.filter { it.id != -1L }
 }

From 19842c5b6b3e7b1bfc63dde1685e7d40247547a7 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 12:07:52 +0100
Subject: [PATCH 074/138] fix accountOwnsFile

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ab51ce336..03856563f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -234,10 +234,9 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
-    // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
-        String noteId = String.valueOf(note.getAccountId());
-        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+        String displayName = account.getDisplayName();
+        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
     }
 
     private void setShareWithYou() {

From 705bb37765193b9a4e817dd5e2f31c6d68a58667 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 12:10:37 +0100
Subject: [PATCH 075/138] skip all types but users, as E2E secure share is only
 allowed to users on same server

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/helper/UsersAndGroupsSearchProvider.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
index a40dc8fc7..462c65dd6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
@@ -122,9 +122,8 @@ public Cursor searchForUsersOrGroups(String userQuery, boolean isFederationShare
                 }
 
                 if (UsersAndGroupsSearchConfig.INSTANCE.getSearchOnlyUsers() && type != ShareType.USER) {
-                    // TODO: Why we need this check?
                     // skip all types but users, as E2E secure share is only allowed to users on same server
-                    // continue;
+                    continue;
                 }
 
                 switch (type) {

From 50a38afd54b17a8f0ea7390de0b5082d8246df8a Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 14:57:49 +0100
Subject: [PATCH 076/138] optimize imports

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt   | 1 -
 .../owncloud/notes/share/adapter/ShareeListAdapter.java          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index d9ad6f254..8437292ca 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -18,7 +18,6 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
 import it.niedermann.owncloud.notes.main.MainActivity
 import it.niedermann.owncloud.notes.persistence.entity.Note
-import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
 import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 79b5c1021..c9550cfe4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareShareBinding;

From cee9c473c170be530eebc84dd34da8041e22250f Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 14 Feb 2025 09:29:05 +0100
Subject: [PATCH 077/138] fix compilation error

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 build.gradle                     |  2 +-
 gradle/verification-metadata.xml | 56 +++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0d7a54628..0f0117265 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     ext {
-        kotlinVersion = '2.1.10'
+        kotlinVersion = '2.0.0'
         commonsVersion = '2.3.1'
     }
     repositories {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3a2956ade..b942a25eb 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8,6 +8,7 @@
          <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
       </trusted-artifacts>
       <ignored-keys>
+         <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="32EE5355A6BC6E42" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
@@ -147,7 +148,10 @@
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD" group="io.grpc"/>
-         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314" group="org.apache.commons" name="commons-parent" version="52"/>
+         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
+            <trusting group="org.apache.commons"/>
+            <trusting group="org.apache.commons" name="commons-parent" version="52"/>
+         </trusted-key>
          <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
          <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
          <trusted-key id="BCC135FC7ED8214F823D73E97FE9900F412D622E" group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0"/>
@@ -4920,6 +4924,14 @@
             <sha256 value="ce28456d366507ca0f91022942a05e388fd98f862a6d8db3105c5c4497a74ce5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.bitfireAT" name="dav4jvm" version="2.2.1">
+         <artifact name="dav4jvm-2.2.1.jar">
+            <sha256 value="e6b8a9ff7ada0841198b18de2d6fd935f1f8754d3c84b8e8e3dc1840648d595d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="dav4jvm-2.2.1.module">
+            <sha256 value="977a16e0c70ee01139463fd4cbd9efd7d7a767c0c8b3e72941b69cbdd2f085d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.16.0">
          <artifact name="annotations-4.16.0.jar">
             <sha256 value="c59e39b1b31b4d5592277cd90012149d740b569d4338f56443cac82c3fbda3d1" origin="Generated by Gradle"/>
@@ -5039,6 +5051,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
          <artifact name="core-0.14.0.aar">
             <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6319,6 +6339,22 @@
             <sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.2">
+         <artifact name="commons-codec-1.2.jar">
+            <sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-codec-1.2.pom">
+            <sha256 value="28d6c089355487fd2e973e091a152727ac27ad2b2c1ec9cbcf916a10fc863148" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="commons-httpclient" name="commons-httpclient" version="3.1">
+         <artifact name="commons-httpclient-3.1.jar">
+            <pgp value="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5"/>
+         </artifact>
+         <artifact name="commons-httpclient-3.1.pom">
+            <sha256 value="8a9b07d458d3e730221dbecdfafa7353ec1babd3b94c843227c47104a90c6d6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.13.0">
          <artifact name="commons-io-2.13.0.jar">
             <sha256 value="671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" origin="Generated by Gradle"/>
@@ -6778,6 +6814,11 @@
             <sha256 value="31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="10">
+         <artifact name="apache-10.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="13">
          <artifact name="apache-13.pom">
             <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
@@ -6919,6 +6960,19 @@
             <sha256 value="dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
+         <artifact name="jackrabbit-parent-2.13.5.pom">
+            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
+         <artifact name="jackrabbit-webdav-2.13.5.jar">
+            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="jackrabbit-webdav-2.13.5.pom">
+            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
          <artifact name="jose4j-0.9.5.jar">
             <sha256 value="808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" origin="Generated by Gradle"/>

From 055e23ff04274df5c99de3b243b6bad0d64c873c Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 12:05:17 +0100
Subject: [PATCH 078/138] add some logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |  13 +-
 .../share/CreateShareViaLinkOperation.java    |  91 +++
 .../notes/share/NoteShareFragment.java        | 647 ++++++++++++++++++
 .../owncloud/notes/share/SyncOperation.java   |  37 +
 .../owncloud/notes/shared/server/Server.kt    |  40 ++
 .../owncloud/notes/shared/user/User.kt        |  56 ++
 .../notes/shared/util/ClipboardUtil.kt        |  50 ++
 app/src/main/res/values/strings.xml           | 127 +---
 gradle/verification-metadata.xml              |  62 +-
 9 files changed, 976 insertions(+), 147 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt

diff --git a/app/build.gradle b/app/build.gradle
index 088e7628a..c18c1a1cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,17 +95,12 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation 'com.google.guava:guava:31.1-android'
-    implementation ('commons-httpclient:commons-httpclient:3.1') {
-        exclude group: 'commons-logging', module: 'commons-logging'
-    }
-
-    implementation("com.github.nextcloud:android-library:2.19.0") {
+    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
+    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
@@ -122,7 +117,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.fragment:fragment:1.8.6'
+    implementation 'androidx.fragment:fragment:1.8.5'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
@@ -139,7 +134,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.11.0'
 
     // Gson
-    implementation 'com.google.code.gson:gson:2.12.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
 
     // ReactiveX
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
new file mode 100644
index 000000000..509fce819
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
@@ -0,0 +1,91 @@
+package it.niedermann.owncloud.notes.share;
+
+import java.util.ArrayList;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+/**
+ * Creates a new public share for a given file
+ */
+public class CreateShareViaLinkOperation extends SyncOperation {
+
+    private final String path;
+    private final String password;
+    private int permissions = OCShare.NO_PERMISSION;
+
+    public CreateShareViaLinkOperation(String path, String password, User user) {
+        super(user);
+
+        this.path = path;
+        this.password = password;
+    }
+
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
+                ShareType.PUBLIC_LINK,
+                "",
+                false,
+                password,
+                permissions);
+        createOp.setGetShareDetails(true);
+        RemoteOperationResult result = createOp.execute(client);
+
+        if (result.isSuccess()) {
+            if (result.getData().size() > 0) {
+                Object item = result.getData().get(0);
+                if (item instanceof OCShare) {
+                    updateData((OCShare) item);
+                } else {
+                    ArrayList<Object> data = result.getData();
+                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+                    result.setData(data);
+                }
+            } else {
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+            }
+        }
+
+        return result;
+    }
+
+    private void updateData(OCShare share) {
+        // Update DB with the response
+        share.setPath(path);
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setFolder(true);
+        } else {
+            share.setFolder(false);
+        }
+
+        // TODO: Save share
+
+        /*
+        getStorageManager().saveShare(share);
+
+        // Update OCFile with data from share: ShareByLink  and publicLink
+        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
+        if (file != null) {
+            file.setSharedViaLink(true);
+            getStorageManager().saveFile(file);
+        }
+         */
+
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
new file mode 100644
index 000000000..5f1004d38
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -0,0 +1,647 @@
+package it.niedermann.owncloud.notes.share;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
+import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
+import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
+
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
+        DisplayUtils.AvatarGenerationListener,
+        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+
+    private static final String TAG = "NoteShareFragment";
+    private static final String ARG_NOTE = "NOTE";
+    private static final String ARG_ACCOUNT = "ACCOUNT";
+    private static final String ARG_USER = "USER";
+
+    private FragmentNoteShareBinding binding;
+    private Note note;
+    private User user;
+    private Account account;
+
+    private OnEditShareListener onEditShareListener;
+
+    public static NoteShareFragment newInstance(Note note, User user, Account account) {
+        NoteShareFragment fragment = new NoteShareFragment();
+        Bundle args = new Bundle();
+        args.putSerializable(ARG_NOTE, note);
+        args.putSerializable(ARG_ACCOUNT, account);
+        args.putParcelable(ARG_USER, user);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
+            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
+            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
+        } else {
+            Bundle arguments = getArguments();
+            if (arguments != null) {
+                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
+                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
+                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
+            }
+        }
+
+        if (note == null) {
+            throw new IllegalArgumentException("Note cannot be null");
+        }
+
+        if (user == null) {
+            throw new IllegalArgumentException("Account cannot be null");
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        refreshCapabilitiesFromDB();
+        refreshSharesFromDB();
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
+
+        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+                new ArrayList<>(),
+                this,
+                user,
+                note));
+
+        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
+
+        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+
+        setupView();
+
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            onEditShareListener = (OnEditShareListener) context;
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Calling activity must implement the interface", e);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        searchConfig.reset();
+    }
+
+    private void setupView() {
+        setShareWithYou();
+
+        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        FileDetailSharingFragmentHelper.setupSearchView(
+                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
+                binding.searchView,
+                fileActivity.getComponentName());
+        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+
+        if (file.canReshare()) {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        } else {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+            binding.searchView.setInputType(InputType.TYPE_NULL);
+            binding.pickContactEmailBtn.setVisibility(View.GONE);
+            disableSearchView(binding.searchView);
+        }
+    }
+
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    // TODO: Check if note.getAccountId() return note's owner's id
+    private boolean accountOwnsFile() {
+        String noteId = String.valueOf(note.getAccountId());
+        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+    }
+
+    private void setShareWithYou() {
+        if (accountOwnsFile()) {
+            binding.sharedWithYouContainer.setVisibility(View.GONE);
+        } else {
+
+            /*
+            // TODO: How to get owner display name from note?
+
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
+
+
+            Glide.with(this)
+                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                    .error(R.drawable.ic_account_circle_grey_24dp)
+                    .apply(RequestOptions.circleCropTransform())
+                    .into(binding.sharedWithYouAvatar);
+
+            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+
+            /*
+            // TODO: Note's note?
+            String note = file.getNote();
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(file.getNote());
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
+             */
+        }
+    }
+
+    private void copyInternalLink() {
+        if (account == null) {
+            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.sharesList)
+                    .show();
+            return;
+        }
+
+        showShareLinkDialog();
+    }
+
+    private void showShareLinkDialog() {
+        String link = createInternalLink();
+
+        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+
+        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+        intentToShareLink.setType("text/plain");
+        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
+
+        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
+        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
+    }
+
+    // TODO: Check account.getUrl returning base url?
+    private String createInternalLink() {
+        Uri baseUri = Uri.parse(account.getUrl());
+        return baseUri + "/index.php/f/" +  note.getId();
+    }
+
+    // TODO: Capabilities in notes app doesn't have following functions...
+    public void createPublicShareLink() {
+        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
+            // Is CreateShareViaLink operation compatible?
+
+            Intent service = new Intent(fileActivity, OperationsService.class);
+            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
+            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
+            if (!TextUtils.isEmpty(password)) {
+                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
+            }
+            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
+        }
+    }
+
+    private void createSecureFileDrop() {
+        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    }
+
+    /*
+    // TODO: Cant call getFileWithLink
+
+     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
+        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
+                                                                                       ShareType.PUBLIC_LINK,
+                                                                                       "");
+
+        if (shares.size() == SINGLE_LINK_SIZE) {
+            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
+        } else {
+            if (fileActivity instanceof FileDisplayActivity) {
+                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
+            } else {
+                showShareFile(file);
+            }
+        }
+
+        fileActivity.refreshList();
+    }
+     */
+    private void showSendLinkTo(OCShare publicShare) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(publicShare.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                // TODO: get link from public share and pass to the function
+                showShareLinkDialog();
+            }
+        }
+    }
+
+    public void copyLink(OCShare share) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(share.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+            }
+        }
+    }
+
+    /**
+     * show share action bottom sheet
+     *
+     * @param share
+     */
+    @Override
+    @VisibleForTesting
+    public void showSharingMenuActionSheet(OCShare share) {
+        if (fileActivity != null && !fileActivity.isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        }
+    }
+
+    /**
+     * show quick sharing permission dialog
+     *
+     * @param share
+     */
+    @Override
+    public void showPermissionsDialog(OCShare share) {
+        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @param file   the edited {@link OCFile}
+     * @see #onUpdateShareInformation(RemoteOperationResult)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
+        this.file = file;
+
+        onUpdateShareInformation(result);
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
+     * OCFile held by this fragment}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            refreshUiFromDB();
+        } else {
+            setupView();
+        }
+    }
+
+    /**
+     * Get {@link OCShare} instance from DB and updates the UI.
+     */
+    private void refreshUiFromDB() {
+        refreshSharesFromDB();
+        // Updates UI with new state
+        setupView();
+    }
+
+    private void unshareWith(OCShare share) {
+        fileOperationsHelper.unshareShare(file, share);
+    }
+
+    /**
+     * Starts a dialog that requests a password to the user to protect a share link.
+     *
+     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
+     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
+     * @param askForPassword if true, password is optional
+     */
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+                createShare,
+                askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void requestPasswordForShare(OCShare share, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void showProfileBottomSheet(User user, String shareWith) {
+        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
+            new RetrieveHoverCardAsyncTask(user,
+                    shareWith,
+                    fileActivity,
+                    clientFactory,
+                    viewThemeUtils).execute();
+        }
+    }
+
+    /**
+     * Get known server capabilities from DB
+     */
+    public void refreshCapabilitiesFromDB() {
+        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+    }
+
+    /**
+     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
+     * before reading database.
+     */
+    public void refreshSharesFromDB() {
+        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
+        if (newFile != null) {
+            file = newFile;
+        }
+
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            return;
+        }
+        adapter.getShares().clear();
+
+        // to show share with users/groups info
+        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
+                user.getAccountName());
+
+        adapter.addShares(shares);
+
+        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
+            return;
+        }
+
+        // Get public share
+        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
+                ShareType.PUBLIC_LINK,
+                "");
+
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
+                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+            final OCShare ocShare = new OCShare();
+            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+            publicShares.add(ocShare);
+        } else {
+            adapter.removeNewPublicShare();
+        }
+
+        adapter.addShares(publicShares);
+    }
+
+    private void checkContactPermission() {
+        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+            pickContactEmail();
+        } else {
+            requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
+        }
+    }
+
+    private void pickContactEmail() {
+        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
+
+        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
+            onContactSelectionResultLauncher.launch(intent);
+        } else {
+            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+        }
+    }
+
+    private void handleContactResult(@NonNull Uri contactUri) {
+        // Define the projection to get all email addresses.
+        String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
+
+        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                // The contact has only one email address, use it.
+                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
+                if (columnIndex != -1) {
+                    // Use the email address as needed.
+                    // email variable contains the selected contact's email address.
+                    String email = cursor.getString(columnIndex);
+                    binding.searchView.post(() -> {
+                        binding.searchView.setQuery(email, false);
+                        binding.searchView.requestFocus();
+                    });
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
+                }
+            } else {
+                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
+            }
+            cursor.close();
+        } else {
+            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
+        }
+    }
+
+    private boolean containsNoNewPublicShare(List<OCShare> shares) {
+        for (OCShare share : shares) {
+            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        FileExtensionsKt.logFileSize(file, TAG);
+        outState.putParcelable(ARG_NOTE, file);
+        outState.putParcelable(ARG_USER, user);
+    }
+
+    @Override
+    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
+        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
+    }
+
+    @Override
+    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
+        return false;
+    }
+
+    private boolean isReshareForbidden(OCShare share) {
+        return ShareType.FEDERATED == share.getShareType() ||
+                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+    }
+
+    @VisibleForTesting
+    public void search(String query) {
+        SearchView searchView = requireView().findViewById(R.id.searchView);
+        searchView.setQuery(query, true);
+    }
+
+    @Override
+    public void advancedPermissions(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+    }
+
+
+    @Override
+    public void sendNewEmail(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+    }
+
+    @Override
+    public void unShare(OCShare share) {
+        unshareWith(share);
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            return;
+        }
+        adapter.remove(share);
+    }
+
+    @Override
+    public void sendLink(OCShare share) {
+        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
+            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
+        } else {
+            showSendLinkTo(share);
+        }
+    }
+
+    @Override
+    public void addAnotherLink(OCShare share) {
+        createPublicShareLink();
+    }
+
+    private void modifyExistingShare(OCShare share, int screenTypePermission) {
+        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
+                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+    }
+
+    @Override
+    public void onQuickPermissionChanged(OCShare share, int permission) {
+        fileOperationsHelper.setPermissionsToShare(share, permission);
+    }
+
+    //launcher for contact permission
+    private final ActivityResultLauncher<String> requestContactPermissionLauncher =
+            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+                if (isGranted) {
+                    pickContactEmail();
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                }
+            });
+
+    //launcher to handle contact selection
+    private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
+            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                    result -> {
+                        if (result.getResultCode() == Activity.RESULT_OK) {
+                            Intent intent = result.getData();
+                            if (intent == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            Uri contactUri = intent.getData();
+                            if (contactUri == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            handleContactResult(contactUri);
+
+                        }
+                    });
+
+    public interface OnEditShareListener {
+        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
+                               boolean isExpiryDateShown);
+
+        void onShareProcessClosed();
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
new file mode 100644
index 000000000..62eb8661a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
@@ -0,0 +1,37 @@
+package it.niedermann.owncloud.notes.share;
+
+
+import android.content.Context;
+import android.os.Handler;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.User;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
+import androidx.annotation.NonNull;
+
+public abstract class SyncOperation extends RemoteOperation {
+    private final User user;
+
+    public SyncOperation(@NonNull User user) {
+        this.user = user;
+    }
+
+    public RemoteOperationResult execute(Context context) {
+        return super.execute(user, context);
+    }
+
+    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
+        return run(client);
+    }
+
+    public Thread execute(OwnCloudClient client,
+                          OnRemoteOperationListener listener,
+                          Handler listenerHandler) {
+        return super.execute(client, listener, listenerHandler);
+    }
+
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
new file mode 100644
index 000000000..be773c7f7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
@@ -0,0 +1,40 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.server
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import java.net.URI
+
+/**
+ * This object provides all information necessary to interact
+ * with backend server.
+ */
+data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
+
+    constructor(source: Parcel) : this(
+        source.readSerializable() as URI,
+        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
+        writeSerializable(uri)
+        writeParcelable(version, 0)
+    }
+
+    companion object {
+        @JvmField
+        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
+            override fun createFromParcel(source: Parcel): Server = Server(source)
+            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
new file mode 100644
index 000000000..b68c4598d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
@@ -0,0 +1,56 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.user
+
+import android.accounts.Account
+import android.os.Parcelable
+import com.owncloud.android.lib.common.OwnCloudAccount
+import it.niedermann.owncloud.notes.shared.server.Server
+
+interface User : Parcelable, com.nextcloud.common.User {
+    override val accountName: String
+    val server: Server
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy platform Account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return Account instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    override fun toPlatformAccount(): Account
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy ownCloud account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return OwnCloudAccount instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    fun toOwnCloudAccount(): OwnCloudAccount
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(user: User?): Boolean
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(accountName: CharSequence?): Boolean
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
new file mode 100644
index 000000000..cb6c5e14f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
@@ -0,0 +1,50 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.shared.util
+
+import android.app.Activity
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.text.TextUtils
+import android.widget.Toast
+import com.owncloud.android.lib.common.utils.Log_OC
+import it.niedermann.owncloud.notes.R
+
+/**
+ * Helper implementation to copy a string into the system clipboard.
+ */
+object ClipboardUtil {
+    private val TAG = ClipboardUtil::class.java.name
+
+    @JvmStatic
+    @JvmOverloads
+    @Suppress("TooGenericExceptionCaught")
+    fun copyToClipboard(activity: Activity, text: String?, showToast: Boolean = true) {
+        if (!TextUtils.isEmpty(text)) {
+            try {
+                val clip = ClipData.newPlainText(
+                    activity.getString(
+                        R.string.clipboard_label,
+                        activity.getString(R.string.app_name)
+                    ),
+                    text
+                )
+                (activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(clip)
+                if (showToast) {
+                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show()
+                }
+            } catch (e: Exception) {
+                Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show()
+                Log_OC.e(TAG, "Exception caught while copying to clipboard", e)
+            }
+        } else {
+            Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show()
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6341244b..06af4e559 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,122 +38,17 @@
 
     <string name="change_category_title">Choose a category</string>
 
-    <!-- UsersAndGroupsSearchProvider -->
-    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
-
-    <!-- QuickSharingPermissionsBottomSheetDialog -->
-    <string-array name="quick_sharing_permission_bottom_sheet_dialog_folder_share_values" translatable="false">
-        <item>@string/link_share_view_only</item>
-        <item>@string/link_share_allow_upload_and_editing</item>
-        <item>@string/link_share_file_drop</item>
-    </string-array>
-    <string-array name="quick_sharing_permission_bottom_sheet_dialog_note_share_values" translatable="false">
-        <item>@string/link_share_view_only</item>
-        <item>@string/link_share_editing</item>
-    </string-array>
-
-    <!-- NoteShareActivity -->
-    <string name="note_share_activity_activity_icon_content_description">note activity icon</string>
-    <string name="note_share_activity_share_icon_content_description">note share icon</string>
-    <string name="note_share_activity_external_icon_content_description">note share external icon</string>
-    <string name="note_share_activity_copy_icon_content_description">note share copy icon</string>
-    <string name="note_share_activity_more_icon_content_description">note share more icon</string>
-    <string name="note_share_activity_icon_content_description">note share icon</string>
-    <string name="note_share_activity_user_icon_content_description">note share user icon</string>
-    <string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
-    <string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
-    <string name="note_share_activity_share_note">Share note</string>
-    <string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
-    <string name="note_share_activity_share_link">Share link</string>
-    <string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>
-    <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
-    <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
-    <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
-
-    <!-- NoteShareDetailActivity -->
-    <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
-    <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
-    <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
-    <string name="note_share_detail_activity_hint_note">Note</string>
-    <string name="note_share_detail_activity_common_next">Next</string>
-    <string name="note_share_detail_activity_share_copy_link">Share and Copy Link</string>
-    <string name="note_share_detail_activity_common_confirm">Confirm</string>
-    <string name="note_share_detail_activity_set_note">Set Note</string>
-    <string name="note_share_detail_activity_send_share">Send Share</string>
-    <string name="note_share_detail_activity_hint_name">Name</string>
-    <string name="note_share_detail_activity_link_name">Link Name</string>
-    <string name="note_share_detail_activity_share_link_empty_password">You must enter a password</string>
-    <string name="note_share_detail_activity_hint_password">Password</string>
-    <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
-    <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
-    <string name="note_share_detail_activity_cancel">Cancel</string>
-    <string name="note_share_detail_activity_create_share_error">Failed to create a share</string>
-
-    <!-- SharePasswordDialogFragment -->
-    <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>
-    <string name="share_password_dialog_fragment_skip">Skip</string>
-
-    <string name="share_link_password_title">Enter a password</string>
-    <string name="common_ok">OK</string>
-    <string name="common_delete">Delete</string>
-    <string name="write_email">Send email</string>
-    <string name="no_browser_available">No app available to handle links</string>
-    <string name="no_email_app_available">No App available to handle mail address</string>
-    <string name="no_actions">No actions for this user</string>
-
-    <string name="failed_the_remove_share">Failed to remove share</string>
-    <string name="email_pick_failed">Failed to pick email address.</string>
-    <string name="failed_update_ui">Failed to update UI</string>
-    <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
-    <string name="activity_chooser_title">Send link to…</string>
-
-    <string name="activity_chooser_send_file_title">Send</string>
-    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
-    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
-    <string name="share_internal_link">Share internal link</string>
-    <string name="delete_link">Delete Link</string>
-    <string name="share_settings">Settings</string>
-    <string name="share_send_new_email">Send new email</string>
-    <string name="share_dialog_title">Sharing</string>
-    <string name="share_file">Share %1$s</string>
-    <string name="share_expiration_date_label">Expires %1$s</string>
-    <string name="share_expiration_date_format">%1$s</string>
-    <string name="share_no_expiration_date_label">Set expiration date</string>
-    <string name="share_via_link_section_title">Share link</string>
-    <string name="share_via_link_send_link_label">Send link</string>
-    <string name="share_password_title">Password-protected</string>
-    <string name="share_no_password_title">Set password</string>
-    <string name="share_with_title">Share with…</string>
-    <string name="share_via_link_unset_password">Unset</string>
-    <string name="add_another_public_share_link">Add another link</string>
-    <string name="add_new_public_share">Add new public share link</string>
-    <string name="public_share_name">New name</string>
-    <string name="share_link_with_label">Share link (%1$s)</string>
-    <string name="share_link">Share link</string>
-    <string name="allow_resharing">Allow resharing</string>
-    <string name="link_share_view_only">View only</string>
-    <string name="link_share_editing">Editing</string>
-    <string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
-    <string name="link_share_file_drop">File drop (upload only)</string>
-    <string name="could_not_retrieve_shares">Could not retrieve shares</string>
-    <string name="share_permission_view_only">View only</string>
-    <string name="share_permission_can_edit">Can edit</string>
-    <string name="share_permission_file_drop">File drop</string>
-    <string name="share_permission_secure_file_drop">Secure file drop</string>
-    <string name="share_permissions">Share Permissions</string>
-    <plurals name="share_download_limit_description">
-        <item quantity="one">%1$d download remaining</item>
-        <item quantity="other">%1$d downloads remaining</item>
-    </plurals>
-    <string name="username">Username</string>
-    <string name="share_group_clarification">%1$s (group)</string>
-    <string name="share_remote_clarification">%1$s (remote)</string>
-    <string name="share_room_clarification">%1$s (conversation)</string>
-    <string name="share_known_remote_on_clarification">on %1$s</string>
-    <string name="remote">(remote)</string>
-
-    <string name="empty" translatable="false" />
+    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
+    <string name="note_share_fragment_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
+    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_fragment_share_link">Share link</string>
+    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b942a25eb..3b295593a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,7 +9,6 @@
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="32EE5355A6BC6E42" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
@@ -107,6 +106,7 @@
             <trusting group="androidx.recyclerview"/>
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
+            <trusting group="androidx.tracing" name="tracing" version="1.2.0"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -855,6 +855,11 @@
             <sha256 value="2a10979bbb3bcd7b25b7f664ab4e9b016fabf2174a26768b677e12e4bea4c7c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core" version="1.15.0">
+         <artifact name="core-1.15.0.aar">
+            <sha256 value="432b85a1974076e14b487ece4a28c59a84f1b9efc3fc8be72cd7f05d32055e51" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core" version="1.9.0">
          <artifact name="core-1.9.0.module">
             <sha256 value="8674ade1d12962469dd2d1e6edc03b465f20d180b0840a129bc40b351e8651d1" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1185,14 +1190,6 @@
             <sha256 value="604b5e65496d8c88d5e6767e82db42dc79b74874b2ae426e4cab624867f101f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment" version="1.8.6">
-         <artifact name="fragment-1.8.6.aar">
-            <sha256 value="6d5aa4c135247a7f8b59ef5d0bb2990f3a8d6502f02c763c8d34df8a410a3731" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="fragment-1.8.6.module">
-            <sha256 value="567576bcb6db841f36358f1646e167360b8725be05cfe284907b66b4b12bedd5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
          <artifact name="fragment-ktx-1.3.6.module">
             <sha256 value="a775bab4e5ef78605c2b0f8bc9dcd9e2c2dd6b5d5d9320012a69a5d01375059a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1206,14 +1203,6 @@
             <sha256 value="a15daf4272633025aed5c2e96073c5e904a147802c669db343237cb3b02ba9b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment-ktx" version="1.8.6">
-         <artifact name="fragment-ktx-1.8.6.aar">
-            <sha256 value="64fad5c91c5f3c59509a458e91045ae1277df29bf32c8dc19d0720b5bab405c2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="fragment-ktx-1.8.6.module">
-            <sha256 value="6f9027367f4a598903feba9c7c0652c9863ca763c39467615353db78eb184c91" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
       <component group="androidx.graphics" name="graphics-path" version="1.0.1">
          <artifact name="graphics-path-1.0.1.aar">
             <sha256 value="8ca4032b6d79b351f0b59ad4b580eddbb9423e1652f7c958830687f1eee2ec03" origin="Generated by Gradle"/>
@@ -5051,12 +5040,12 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
-         <artifact name="android-library-2.19.0.aar">
-            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+      <component group="com.github.nextcloud" name="android-library" version="3d422b28376339c0fbd772e480dbbdc56b7ae1a1">
+         <artifact name="android-library-3d422b28376339c0fbd772e480dbbdc56b7ae1a1.aar">
+            <sha256 value="58debdb6fecf8f254f38bed011ea4849405017679c7978755e2a004031b3f69e" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
-         <artifact name="android-library-2.19.0.module">
-            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         <artifact name="android-library-3d422b28376339c0fbd772e480dbbdc56b7ae1a1.module">
+            <sha256 value="b14de6c6ed598b5b31cb8842b41f1cbb03313bf4bc29eaaa9dfd17f07b6dd8f0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
@@ -5155,6 +5144,14 @@
             <sha256 value="16df4da63602c412d8712018c4b35ce24cb040761bcbc026fbcd836dbe953171" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="core" version="0.24.0">
+         <artifact name="core-0.24.0.aar">
+            <sha256 value="38011f3adff2f68c6c99cb121a5def63cc44a66e393373203687b59c5fb82ce8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-0.24.0.module">
+            <sha256 value="4933e71a2214d32a50ac9b7eb8364d763a3d8359b846554bc61e252e2cd5b76a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.14.0">
          <artifact name="material-color-utilities-0.14.0.jar">
             <sha256 value="bfcd5205b056b948bc6ff9a556898188f4a4e92179c723906e10f1164b776eed" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5251,6 +5248,14 @@
             <sha256 value="ca3c0835e5534a549d3718380982ba8cead70613ca436d65606f16cd2e3a0f01" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.24.0">
+         <artifact name="material-color-utilities-0.24.0.jar">
+            <sha256 value="370a11bc5dc92c798d45e991c0bc98501b0e985558033db0e78994547b8b1e40" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="material-color-utilities-0.24.0.module">
+            <sha256 value="b044a07295fb43cd61c53ac656e3f44f9df42e87e6c82121eeb17c3c4d124557" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="ui" version="0.14.0">
          <artifact name="ui-0.14.0.aar">
             <sha256 value="2ff1b8ca1ce4d4151ce967c4704a4def19a128d3f710491872e007217f3ac84f" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5347,6 +5352,14 @@
             <sha256 value="4af371de8c6cd41a24f1a3ade9cd010c5d226a583d95ff909b1ca80f02d86db6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="ui" version="0.24.0">
+         <artifact name="ui-0.24.0.aar">
+            <sha256 value="9eaf161c0535e87fec9585d97b5d5244229c7fdbde348bfebf7747f5bcd3f952" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-0.24.0.module">
+            <sha256 value="44a79acec2d56dc761557dec949ab539af6199d1267cc7fafb7a09c9be3f35f9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann" name="android-commons" version="1.0.0">
          <artifact name="android-commons-1.0.0.jar">
             <sha256 value="670f84d9ef31964f1b548204d83c81a44142106c69d4188b20556bc32f4ee3dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5915,6 +5928,11 @@
             <sha256 value="41858c84753fd96a6b7c51122fccef39558c91cc08264e08506bcf20e0e63733" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="33.4.0-jre">
+         <artifact name="guava-33.4.0-android.jar">
+            <sha256 value="e335cd1678426f15e04ae4f623c58b4c176572d7258c6ea64e3437cdc01e5707" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava-parent" version="26.0-android">
          <artifact name="guava-parent-26.0-android.pom">
             <sha256 value="f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04" origin="Generated by Gradle"/>

From 370c4bd9b28c52991c655b63c7e4874df09d63d4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:06:51 +0100
Subject: [PATCH 079/138] first successfull build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |   9 +-
 .../notes/share/ClientFactoryImpl.java        |  84 +++++++
 .../notes/share/NoteShareFragment.java        | 209 +++++++++++-------
 app/src/main/res/layout/activity_row.xml      |   2 +-
 app/src/main/res/values/strings.xml           |  75 +++++++
 gradle/verification-metadata.xml              |  30 ++-
 6 files changed, 323 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java

diff --git a/app/build.gradle b/app/build.gradle
index c18c1a1cb..513be6a83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,12 +95,17 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
+    implementation 'com.google.guava:guava:31.1-android'
+    implementation ('commons-httpclient:commons-httpclient:3.1') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+
+    implementation("com.github.nextcloud:android-library:2.19.0") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
+    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
new file mode 100644
index 000000000..b9c82d25e
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.share.operations;
+
+import android.accounts.Account;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.PlainClient;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+
+import java.io.IOException;
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public class ClientFactoryImpl implements ClientFactory {
+
+    private Context context;
+
+    public ClientFactoryImpl(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public OwnCloudClient create(User user) throws CreationException {
+        try {
+            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
+        } catch (OperationCanceledException |
+            AuthenticatorException |
+            IOException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public NextcloudClient createNextcloudClient(User user) throws CreationException {
+        try {
+            return OwnCloudClientFactory.createNextcloudClient(user, context);
+        } catch (AccountUtils.AccountNotFoundException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public OwnCloudClient create(Account account)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context);
+    }
+
+    @Override
+    public OwnCloudClient create(Account account, Activity currentActivity)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public PlainClient createPlainClient() {
+        return new PlainClient(context);
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 5f1004d38..759c8a8f0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -3,8 +3,10 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.SearchManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -15,6 +17,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -22,6 +25,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -29,6 +33,11 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,18 +48,26 @@
 import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
+import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
+import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
-        DisplayUtils.AvatarGenerationListener,
-        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
     private static final String ARG_USER = "USER";
+    public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
     private FragmentNoteShareBinding binding;
     private Note note;
@@ -58,6 +75,7 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
     private Account account;
 
     private OnEditShareListener onEditShareListener;
+    private ClientFactoryImpl clientFactory;
 
     public static NoteShareFragment newInstance(Note note, User user, Account account) {
         NoteShareFragment fragment = new NoteShareFragment();
@@ -73,6 +91,8 @@ public static NoteShareFragment newInstance(Note note, User user, Account accoun
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        clientFactory = new ClientFactoryImpl(requireContext());
+
         if (savedInstanceState != null) {
             note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
             account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
@@ -107,11 +127,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         binding = FragmentNoteShareBinding.inflate(inflater, container, false);
 
-        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
                 new ArrayList<>(),
                 this,
                 user,
-                note));
+                account));
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
 
@@ -141,26 +161,29 @@ public void onAttach(@NonNull Context context) {
     @Override
     public void onStart() {
         super.onStart();
-        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
     }
 
     @Override
     public void onStop() {
         super.onStop();
-        searchConfig.reset();
+        UsersAndGroupsSearchConfig.INSTANCE.reset();
     }
 
     private void setupView() {
         setShareWithYou();
 
-        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
+        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
-        FileDetailSharingFragmentHelper.setupSearchView(
-                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
-                binding.searchView,
-                fileActivity.getComponentName());
-        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
+        binding.pickContactEmailBtn.setVisibility(View.GONE);
+        disableSearchView(binding.searchView);
 
+        /*
         if (file.canReshare()) {
             binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
         } else {
@@ -169,6 +192,39 @@ private void setupView() {
             binding.pickContactEmailBtn.setVisibility(View.GONE);
             disableSearchView(binding.searchView);
         }
+         */
+
+    }
+
+    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
+                                       ComponentName componentName) {
+        if (searchManager == null) {
+            searchView.setVisibility(View.GONE);
+            return;
+        }
+
+        // assumes parent activity is the searchable activity
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
+
+        // do not iconify the widget; expand it by default
+        searchView.setIconifiedByDefault(false);
+
+        // avoid fullscreen with softkeyboard
+        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                // return true to prevent the query from being processed;
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                // leave it for the parent listener in the hierarchy / default behaviour
+                return false;
+            }
+        });
     }
 
     private void disableSearchView(View view) {
@@ -223,7 +279,7 @@ private void setShareWithYou() {
         }
     }
 
-    private void copyInternalLink() {
+    public void copyInternalLink() {
         if (account == null) {
             BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
                     .setAnchorView(binding.sharesList)
@@ -245,7 +301,7 @@ private void showShareLinkDialog() {
 
         String[] packagesToExclude = new String[] { requireContext().getPackageName() };
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
+        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
     // TODO: Check account.getUrl returning base url?
@@ -256,6 +312,7 @@ private String createInternalLink() {
 
     // TODO: Capabilities in notes app doesn't have following functions...
     public void createPublicShareLink() {
+        /*
         if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
                 capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
             // password enforced by server, request to the user before trying to create
@@ -275,10 +332,12 @@ public void createPublicShareLink() {
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
+         */
+
     }
 
-    private void createSecureFileDrop() {
-        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    public void createSecureFileDrop() {
+        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
     }
 
     /*
@@ -303,6 +362,7 @@ public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewTheme
     }
      */
     private void showSendLinkTo(OCShare publicShare) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(publicShare.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -311,9 +371,12 @@ private void showSendLinkTo(OCShare publicShare) {
                 showShareLinkDialog();
             }
         }
+         */
+
     }
 
     public void copyLink(OCShare share) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(share.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -321,51 +384,22 @@ public void copyLink(OCShare share) {
                 ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
             }
         }
+         */
+
     }
 
-    /**
-     * show share action bottom sheet
-     *
-     * @param share
-     */
     @Override
-    @VisibleForTesting
     public void showSharingMenuActionSheet(OCShare share) {
-        if (fileActivity != null && !fileActivity.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        if (getActivity() != null && !getActivity().isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
         }
     }
 
-    /**
-     * show quick sharing permission dialog
-     *
-     * @param share
-     */
     @Override
     public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
     }
 
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @param file   the edited {@link OCFile}
-     * @see #onUpdateShareInformation(RemoteOperationResult)
-     */
-    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
-        this.file = file;
-
-        onUpdateShareInformation(result);
-    }
-
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
-     * OCFile held by this fragment}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
-     */
     public void onUpdateShareInformation(RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshUiFromDB();
@@ -384,7 +418,7 @@ private void refreshUiFromDB() {
     }
 
     private void unshareWith(OCShare share) {
-        fileOperationsHelper.unshareShare(file, share);
+        // fileOperationsHelper.unshareShare(file, share);
     }
 
     /**
@@ -395,7 +429,7 @@ private void unshareWith(OCShare share) {
      * @param askForPassword if true, password is optional
      */
     public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
                 createShare,
                 askForPassword);
         dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
@@ -411,10 +445,10 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     public void showProfileBottomSheet(User user, String shareWith) {
         if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
             new RetrieveHoverCardAsyncTask(user,
+                    account,
                     shareWith,
-                    fileActivity,
-                    clientFactory,
-                    viewThemeUtils).execute();
+                    getActivity(),
+                    clientFactory).execute();
         }
     }
 
@@ -422,7 +456,7 @@ public void showProfileBottomSheet(User user, String shareWith) {
      * Get known server capabilities from DB
      */
     public void refreshCapabilitiesFromDB() {
-        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
     /**
@@ -430,6 +464,7 @@ public void refreshCapabilitiesFromDB() {
      * before reading database.
      */
     public void refreshSharesFromDB() {
+        /*
         OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
         if (newFile != null) {
             file = newFile;
@@ -438,7 +473,8 @@ public void refreshSharesFromDB() {
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.getShares().clear();
@@ -458,8 +494,7 @@ public void refreshSharesFromDB() {
                 ShareType.PUBLIC_LINK,
                 "");
 
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
-                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
             final OCShare ocShare = new OCShare();
             ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
             publicShares.add(ocShare);
@@ -468,10 +503,12 @@ public void refreshSharesFromDB() {
         }
 
         adapter.addShares(publicShares);
+         */
+
     }
 
     private void checkContactPermission() {
-        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
             pickContactEmail();
         } else {
             requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
@@ -484,7 +521,8 @@ private void pickContactEmail() {
         if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
             onContactSelectionResultLauncher.launch(intent);
         } else {
-            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
+                    .show();
         }
     }
 
@@ -492,7 +530,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
         // Define the projection to get all email addresses.
         String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
 
-        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
 
         if (cursor != null) {
             if (cursor.moveToFirst()) {
@@ -507,16 +545,19 @@ private void handleContactResult(@NonNull Uri contactUri) {
                         binding.searchView.requestFocus();
                     });
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                            .show();
                     Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
                 }
             } else {
-                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                        .show();
                 Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
             }
             cursor.close();
         } else {
-            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
         }
     }
@@ -534,24 +575,22 @@ private boolean containsNoNewPublicShare(List<OCShare> shares) {
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        FileExtensionsKt.logFileSize(file, TAG);
-        outState.putParcelable(ARG_NOTE, file);
+        outState.putSerializable(ARG_NOTE, note);
+        outState.putSerializable(ARG_ACCOUNT, account);
         outState.putParcelable(ARG_USER, user);
     }
 
-    @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
     }
 
-    @Override
     public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
         return false;
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return ShareType.FEDERATED == share.getShareType() ||
-                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+        return false;
+        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -562,13 +601,13 @@ public void search(String query) {
 
     @Override
     public void advancedPermissions(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
     }
 
 
     @Override
     public void sendNewEmail(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
     }
 
     @Override
@@ -576,7 +615,8 @@ public void unShare(OCShare share) {
         unshareWith(share);
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.remove(share);
@@ -584,11 +624,14 @@ public void unShare(OCShare share) {
 
     @Override
     public void sendLink(OCShare share) {
+        /*
         if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
             FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
         } else {
             showSendLinkTo(share);
         }
+         */
+
     }
 
     @Override
@@ -597,13 +640,12 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
-                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
     }
 
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
-        fileOperationsHelper.setPermissionsToShare(share, permission);
+       // fileOperationsHelper.setPermissionsToShare(share, permission);
     }
 
     //launcher for contact permission
@@ -612,7 +654,8 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 if (isGranted) {
                     pickContactEmail();
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
+                            .show();
                 }
             });
 
@@ -623,13 +666,15 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                         if (result.getResultCode() == Activity.RESULT_OK) {
                             Intent intent = result.getData();
                             if (intent == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
                             Uri contactUri = intent.getData();
                             if (contactUri == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index ffb8e2e6c..8d6e4d150 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/note_share_activity_activity_icon_content_description" />
+        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06af4e559..944bfa5c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,18 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string-array name="folder_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_allow_upload_and_editing</item>
+        <item>@string/link_share_file_drop</item>
+    </string-array>
+    <string-array name="file_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_editing</item>
+    </string-array>
+    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
+    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
     <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
     <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
     <string name="note_share_fragment_icon_content_description">note share icon</string>
@@ -49,6 +61,69 @@
     <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
     <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
     <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="contact_no_permission">Contact permission is required.</string>
+    <string name="share_link_empty_password">You must enter a password</string>
+    <string name="hint_password">Password</string>
+    <string name="share_link_optional_password_title">Enter an optional password</string>
+    <string name="common_skip">Skip</string>
+    <string name="common_cancel">Cancel</string>
+    <string name="empty" translatable="false" />
+    <string name="share_link_password_title">Enter a password</string>
+    <string name="common_ok">OK</string>
+    <string name="common_delete">Delete</string>
+    <string name="write_email">Send email</string>
+    <string name="no_browser_available">No app available to handle links</string>
+    <string name="no_email_app_available">No App available to handle mail address</string>
+    <string name="no_actions">No actions for this user</string>
+
+    <string name="email_pick_failed">Failed to pick email address.</string>
+    <string name="failed_update_ui">Failed to update UI</string>
+    <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
+    <string name="activity_chooser_title">Send link to…</string>
+
+    <string name="activity_chooser_send_file_title">Send</string>
+    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
+    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
+    <string name="share_internal_link">Share internal link</string>
+    <string name="delete_link">Delete Link</string>
+    <string name="share_settings">Settings</string>
+    <string name="share_send_new_email">Send new email</string>
+    <string name="share_dialog_title">Sharing</string>
+    <string name="share_file">Share %1$s</string>
+    <string name="share_expiration_date_label">Expires %1$s</string>
+    <string name="share_expiration_date_format">%1$s</string>
+    <string name="share_no_expiration_date_label">Set expiration date</string>
+    <string name="share_via_link_section_title">Share link</string>
+    <string name="share_via_link_send_link_label">Send link</string>
+    <string name="share_password_title">Password-protected</string>
+    <string name="share_no_password_title">Set password</string>
+    <string name="share_with_title">Share with…</string>
+    <string name="share_via_link_unset_password">Unset</string>
+    <string name="add_another_public_share_link">Add another link</string>
+    <string name="add_new_public_share">Add new public share link</string>
+    <string name="public_share_name">New name</string>
+    <string name="share_link_with_label">Share link (%1$s)</string>
+    <string name="share_link">Share link</string>
+    <string name="allow_resharing">Allow resharing</string>
+    <string name="link_share_view_only">View only</string>
+    <string name="link_share_editing">Editing</string>
+    <string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
+    <string name="link_share_file_drop">File drop (upload only)</string>
+    <string name="could_not_retrieve_shares">Could not retrieve shares</string>
+    <string name="share_permission_view_only">View only</string>
+    <string name="share_permission_can_edit">Can edit</string>
+    <string name="share_permission_file_drop">File drop</string>
+    <string name="share_permission_secure_file_drop">Secure file drop</string>
+    <string name="share_permissions">Share Permissions</string>
+    <plurals name="share_download_limit_description">
+        <item quantity="one">%1$d download remaining</item>
+        <item quantity="other">%1$d downloads remaining</item>
+    </plurals>
+    <string name="username">Username</string>
+    <string name="share_group_clarification">%1$s (group)</string>
+    <string name="share_remote_clarification">%1$s (remote)</string>
+    <string name="share_room_clarification">%1$s (conversation)</string>
+    <string name="share_known_remote_on_clarification">on %1$s</string>
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3b295593a..07f1c940a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -35,7 +35,10 @@
          </trusted-key>
          <trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E" group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.5.2"/>
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
-         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
+         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638">
+            <trusting group="org.checkerframework" name="checker-compat-qual" version="2.5.5"/>
+            <trusting group="org.checkerframework" name="checker-qual"/>
+         </trusted-key>
          <trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
          <trusted-key id="1D9AA7F9E1E2824728B8CD1794B291AEF984A085" group="io.reactivex.rxjava2"/>
          <trusted-key id="24D04176586361FDA94EE0315F7786DF73E61F56" group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.0-1.0.13"/>
@@ -107,6 +110,7 @@
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
             <trusting group="androidx.tracing" name="tracing" version="1.2.0"/>
+            <trusting group="androidx.tracing" name="tracing-ktx" version="1.2.0"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -130,15 +134,18 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.collection"/>
+            <trusting group="androidx.concurrent"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.graphics"/>
             <trusting group="androidx.lifecycle"/>
+            <trusting group="androidx.recyclerview" name="recyclerview" version="1.4.0"/>
             <trusting group="androidx.test"/>
             <trusting group="androidx.test.espresso" name="espresso-idling-resource" version="3.6.1"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
+            <trusting group="androidx.work" name="work-runtime" version="2.10.0"/>
             <trusting group="androidx.work" name="work-runtime" version="2.9.1"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
@@ -1521,6 +1528,11 @@
             <sha256 value="179fc4d2d022c0a8247e7612feab40b951bd8710f6b452e3ed6dc03a1e52769d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.recyclerview" name="recyclerview" version="1.4.0">
+         <artifact name="recyclerview-1.4.0.aar">
+            <sha256 value="0f32ccaffcda74c3f87f0b4cfe6ae78e8aa4eb3ad7dda4f2edf06eedc947a5cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.recyclerview" name="recyclerview-selection" version="1.1.0">
          <artifact name="recyclerview-selection-1.1.0.aar">
             <sha256 value="9e2ba1c7d6b0eb5e64c10b1b0eb01b51e8511cee002c9bd56ce9cc138ebc4898" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5040,6 +5052,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="3d422b28376339c0fbd772e480dbbdc56b7ae1a1">
          <artifact name="android-library-3d422b28376339c0fbd772e480dbbdc56b7ae1a1.aar">
             <sha256 value="58debdb6fecf8f254f38bed011ea4849405017679c7978755e2a004031b3f69e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6389,6 +6409,14 @@
             <sha256 value="5777d292251c7895c04a4c57015683ec3b353a12486c9b3e7178e9b0b3c38fff" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-logging" name="commons-logging" version="1.0.4">
+         <artifact name="commons-logging-1.0.4.jar">
+            <sha256 value="e94af49749384c11f5aa50e8d0f5fe679be771295b52030338d32843c980351e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-logging-1.0.4.pom">
+            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.jar">
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>

From 534257e798fedfc4ba710e20d590044f689705f6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 15:21:40 +0100
Subject: [PATCH 080/138] fix build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/dao/ShareDao.kt         |  10 +-
 .../notes/share/NoteShareActivity.java        | 334 +++++++++++++-----
 2 files changed, 255 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 15ab98f80..97f27cac0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Query("SELECT * FROM share_table WHERE path = :path")
-    fun getShareEntities(path: String): List<ShareEntity>
+    @Insert
+    fun addShareEntity(entity: ShareEntity)
+
+    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
+    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 03856563f..25408bd48 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,6 +14,7 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -26,11 +27,17 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
+import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +45,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
@@ -46,22 +55,26 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
-import it.niedermann.owncloud.notes.share.dialog.NoteShareActivityShareItemActionBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
-import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
+import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
+import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -75,6 +88,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
+    private ClientFactoryImpl clientFactory;
     private ShareRepository repository;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -96,11 +110,12 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        executorService.schedule(() -> {
+        clientFactory = new ClientFactoryImpl(this);
+
+        new Thread(() -> {{
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
-                repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
@@ -115,7 +130,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
+        }}).start();
     }
 
     @Override
@@ -133,6 +148,23 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
+
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        // TODO: When to disable?
+        // binding.pickContactEmailBtn.setVisibility(View.GONE);
+        // disableSearchView(binding.searchView);
+
+        /*
+        if (file.canReshare()) {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        } else {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+            binding.searchView.setInputType(InputType.TYPE_NULL);
+            binding.pickContactEmailBtn.setVisibility(View.GONE);
+            disableSearchView(binding.searchView);
+        }
+         */
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -141,7 +173,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null, account);
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -175,11 +207,11 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    final var isFederationShareAllowed = repository.capabilities().getFederationShare();
-                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
-                        runOnUiThread(() -> {
-                            {
+                    try {
+                        provider.searchForUsersOrGroups(newText, cursor -> {
+                            runOnUiThread(() -> {{
                                 if (cursor == null || cursor.getCount() == 0) {
+                                    suggestionAdapter.changeCursor(null);
                                     return;
                                 }
 
@@ -188,7 +220,7 @@ public boolean onQueryTextChange(String newText) {
                                 }
 
                                 binding.progressBar.setVisibility(View.GONE);
-                            }
+                            }});
                         });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
@@ -234,17 +266,62 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
-        String displayName = account.getDisplayName();
-        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
+        String noteId = String.valueOf(note.getAccountId());
+        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
     }
 
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
+        } else {
+
+            /*
+            // TODO: How to get owner display name from note?
+
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
+
+
+            loadAvatar();
+
+            /*
+            // TODO: Note's note?
+            String note = file.getNote();
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(file.getNote());
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
+             */
         }
     }
 
+    private void loadAvatar() {
+        Glide.with(this)
+                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                .error(R.drawable.ic_account_circle_grey_24dp)
+                .apply(RequestOptions.circleCropTransform())
+                .into(binding.sharedWithYouAvatar);
+
+        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+    }
+
     public void copyInternalLink() {
         if (account == null) {
             DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
@@ -254,16 +331,6 @@ public void copyInternalLink() {
         showShareLinkDialog();
     }
 
-    @Override
-    public void createPublicShareLink() {
-
-    }
-
-    @Override
-    public void createSecureFileDrop() {
-
-    }
-
     private void showShareLinkDialog() {
         String link = createInternalLink();
 
@@ -283,15 +350,85 @@ private String createInternalLink() {
         return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
-    @Override
-    public void copyLink(OCShare share) {
+    // TODO: Capabilities in notes app doesn't have following functions...
+    public void createPublicShareLink() {
+        /*
+        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
+            // Is CreateShareViaLink operation compatible?
+
+            Intent service = new Intent(fileActivity, OperationsService.class);
+            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
+            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
+            if (!TextUtils.isEmpty(password)) {
+                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
+            }
+            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
+        }
+         */
+    }
+
+    public void createSecureFileDrop() {
+        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    }
+
+    /*
+    // TODO: Cant call getFileWithLink
+
+     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
+        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
+                                                                                       ShareType.PUBLIC_LINK,
+                                                                                       "");
+
+        if (shares.size() == SINGLE_LINK_SIZE) {
+            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
+        } else {
+            if (fileActivity instanceof FileDisplayActivity) {
+                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
+            } else {
+                showShareFile(file);
+            }
+        }
+
+        fileActivity.refreshList();
+    }
+     */
+    private void showSendLinkTo(OCShare publicShare) {
+        /*
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(publicShare.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                // TODO: get link from public share and pass to the function
+                showShareLinkDialog();
+            }
+        }
+         */
+    }
 
+    public void copyLink(OCShare share) {
+        /*
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(share.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+            }
+        }
+         */
     }
 
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
         if (!this.isFinishing()) {
-            new NoteShareActivityShareItemActionBottomSheetDialog(this, this, share).show();
+            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
         }
     }
 
@@ -300,6 +437,41 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
+    public void onUpdateShareInformation(RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            refreshUiFromDB();
+        } else {
+            setupView();
+        }
+    }
+
+    /**
+     * Get {@link OCShare} instance from DB and updates the UI.
+     */
+    private void refreshUiFromDB() {
+        refreshSharesFromDB();
+        // Updates UI with new state
+        setupView();
+    }
+
+    private void unshareWith(OCShare share) {
+        repository.removeShare(share.getId());
+    }
+
+    /**
+     * Starts a dialog that requests a password to the user to protect a share link.
+     *
+     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
+     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
+     * @param askForPassword if true, password is optional
+     */
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
+                createShare,
+                askForPassword);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
@@ -307,15 +479,31 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     }
 
     @Override
-    public void showProfileBottomSheet(Account account, String shareWith) {
+    public void showProfileBottomSheet(User user, String shareWith) {
+        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
+            new RetrieveHoverCardAsyncTask(user,
+                    account,
+                    shareWith,
+                    this,
+                    clientFactory).execute();
+        }
     }
 
+    /**
+     * Get known server capabilities from DB
+     */
     public void refreshCapabilitiesFromDB() {
+        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
+    /**
+     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
+     * before reading database.
+     */
     public void refreshSharesFromDB() {
-        executorService.schedule(() -> {
+        new Thread(() -> {
             try {
+                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
@@ -328,8 +516,8 @@ public void refreshSharesFromDB() {
                 // to show share with users/groups info
                 List<OCShare> shares = new ArrayList<>();
 
-                if (note != null) {
-                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
+                if (note != null && note.getRemoteId() != null) {
+                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
@@ -344,24 +532,23 @@ public void refreshSharesFromDB() {
                     adapter.addShares(shares);
 
                     // TODO: Will be added later on...
-                    /*
-                         List<OCShare> publicShares = new ArrayList<>();
-
-                        if (containsNoNewPublicShare(adapter.getShares())) {
-                            final OCShare ocShare = new OCShare();
-                            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-                            publicShares.add(ocShare);
-                        } else {
-                            adapter.removeNewPublicShare();
-                        }
+                    List<OCShare> publicShares = new ArrayList<>();
+
+                    if (containsNoNewPublicShare(adapter.getShares())) {
+                        final OCShare ocShare = new OCShare();
+                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+                        publicShares.add(ocShare);
+                    } else {
+                        adapter.removeNewPublicShare();
+                    }
 
-                        adapter.addShares(publicShares);
-                     */
+                    adapter.addShares(publicShares);
                 });
             } catch (Exception e) {
-                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
+                throw new RuntimeException(e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
+        }).start();
+
     }
 
     private void checkContactPermission() {
@@ -434,6 +621,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
     private boolean isReshareForbidden(OCShare share) {
         return false;
+        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -455,26 +643,24 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        executorService.schedule(() -> {
-            final var result = repository.removeShare(share.getId());
-
-            runOnUiThread(() -> {
-                if (result) {
-                    ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-                    if (adapter == null) {
-                        DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.email_pick_failed));
-                        return;
-                    }
-                    adapter.remove(share);
-                } else {
-                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
-                }
-            });
-        }, 0, TimeUnit.MICROSECONDS);
+        unshareWith(share);
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+            return;
+        }
+        adapter.remove(share);
     }
 
     @Override
     public void sendLink(OCShare share) {
+        /*
+        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
+            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
+        } else {
+            showSendLinkTo(share);
+        }
+         */
     }
 
     @Override
@@ -488,34 +674,19 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
         bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
         bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
         bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
-        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, getExpDateShown());
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
         startActivity(intent);
     }
 
-    private boolean getExpDateShown() {
-        try {
-            final var capabilities = repository.capabilities();
-            final var majorVersionAsString = capabilities.getNextcloudMajorVersion();
-            if (majorVersionAsString != null) {
-                final var majorVersion = Integer.parseInt(majorVersionAsString);
-                return majorVersion >= 18;
-            }
-
-            return false;
-        } catch (NumberFormatException e) {
-            Log_OC.d(TAG, "Exception while getting expDateShown");
-            return false;
-        }
-    }
-
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
     }
 
+    //launcher for contact permission
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
@@ -526,6 +697,7 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 }
             });
 
+    //launcher to handle contact selection
     private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                     result -> {
@@ -556,10 +728,4 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
-
-    @Override
-    protected void onDestroy() {
-        executorService.shutdown();
-        super.onDestroy();
-    }
 }

From 54ff709edb46ee9d330a6b426de2d9f0031b6e00 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:07:33 +0100
Subject: [PATCH 081/138] add createPublicShareLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../sync/CapabilitiesDeserializer.java        |  22 ++
 .../notes/share/NoteShareActivity.java        | 364 ++++++------------
 .../share/adapter/ShareeListAdapter.java      |   4 +-
 .../adapter/holder/LinkShareViewHolder.java   |   6 +-
 .../notes/share/model/CreateShareRequest.kt   |   6 +-
 .../notes/share/repository/ShareRepository.kt |   2 +-
 .../notes/shared/model/Capabilities.java      |  21 +
 7 files changed, 172 insertions(+), 253 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index 48b5428f5..7cc6679d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -43,6 +43,20 @@ public class CapabilitiesDeserializer implements JsonDeserializer<Capabilities>
     private static final String CAPABILITIES_FILES_SHARING = "files_sharing";
     private static final String VERSION = "version";
 
+    /*
+    if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+            capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                                           capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // create without password if not enforced by server or we don't know if enforced;
+            fileOperationsHelper.shareFileViaPublicShare(file, null);
+        }
+
+        password -> {JsonObject@32644} "{"enforced":false,"askForOptionalPassword":false}"
+     */
     @Override
     public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         final var response = new Capabilities();
@@ -69,6 +83,14 @@ public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializat
                 final var outgoing = federation.get("outgoing");
 
                 response.setFederationShare(outgoing.getAsBoolean());
+
+                final var publicObject = filesSharing.getAsJsonObject("public");
+                final var password = publicObject.getAsJsonObject("password");
+                final var enforced = password.getAsJsonPrimitive("enforced");
+                final var askForOptionalPassword = password.getAsJsonPrimitive("askForOptionalPassword");
+
+                response.setPublicPasswordEnforced(enforced.getAsBoolean());
+                response.setAskForOptionalPassword(askForOptionalPassword.getAsBoolean());
             }
 
             if (capabilities.has(CAPABILITIES_NOTES)) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 25408bd48..4295b1896 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,7 +14,6 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -27,17 +26,12 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
-import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
-import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,9 +39,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
@@ -55,26 +47,25 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
-import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.NoteShareActivityShareItemActionBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.CreateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
-import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
-import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.model.Capabilities;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
+import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -88,8 +79,8 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
-    private ClientFactoryImpl clientFactory;
     private ShareRepository repository;
+    private Capabilities capabilities;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -110,12 +101,12 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        clientFactory = new ClientFactoryImpl(this);
-
-        new Thread(() -> {{
+        executorService.schedule(() -> {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
+                capabilities = repository.capabilities();
+                repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
@@ -130,7 +121,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }}).start();
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override
@@ -148,23 +139,6 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
-        // TODO: When to disable?
-        // binding.pickContactEmailBtn.setVisibility(View.GONE);
-        // disableSearchView(binding.searchView);
-
-        /*
-        if (file.canReshare()) {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
-        } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-            binding.searchView.setInputType(InputType.TYPE_NULL);
-            binding.pickContactEmailBtn.setVisibility(View.GONE);
-            disableSearchView(binding.searchView);
-        }
-         */
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -173,7 +147,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null, account);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -207,11 +181,16 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    try {
-                        provider.searchForUsersOrGroups(newText, cursor -> {
-                            runOnUiThread(() -> {{
+                    if (capabilities == null) {
+                        Log_OC.d(TAG, "Capabilities cannot be null");
+                        return;
+                    }
+
+                    final var isFederationShareAllowed = capabilities.getFederationShare();
+                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
+                        runOnUiThread(() -> {
+                            {
                                 if (cursor == null || cursor.getCount() == 0) {
-                                    suggestionAdapter.changeCursor(null);
                                     return;
                                 }
 
@@ -220,7 +199,7 @@ public boolean onQueryTextChange(String newText) {
                                 }
 
                                 binding.progressBar.setVisibility(View.GONE);
-                            }});
+                            }
                         });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
@@ -266,62 +245,17 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
-    private void disableSearchView(View view) {
-        view.setEnabled(false);
-
-        if (view instanceof ViewGroup viewGroup) {
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                disableSearchView(viewGroup.getChildAt(i));
-            }
-        }
-    }
-
-    // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
-        String noteId = String.valueOf(note.getAccountId());
-        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+        String displayName = account.getDisplayName();
+        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
     }
 
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
-        } else {
-
-            /*
-            // TODO: How to get owner display name from note?
-
-             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
-             */
-
-
-            loadAvatar();
-
-            /*
-            // TODO: Note's note?
-            String note = file.getNote();
-
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
-            }
-             */
         }
     }
 
-    private void loadAvatar() {
-        Glide.with(this)
-                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.sharedWithYouAvatar);
-
-        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
-    }
-
     public void copyInternalLink() {
         if (account == null) {
             DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
@@ -331,6 +265,33 @@ public void copyInternalLink() {
         showShareLinkDialog();
     }
 
+    @Override
+    public void createPublicShareLink() {
+        if (capabilities == null) {
+            Log_OC.d(TAG, "Capabilities cannot be null");
+            return;
+        }
+
+        if (capabilities.getPublicPasswordEnforced() || capabilities.getAskForOptionalPassword()) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true, capabilities.getAskForOptionalPassword());
+        } else {
+            executorService.schedule(() -> {
+                repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
+            }, 0, TimeUnit.MICROSECONDS);
+        }
+    }
+
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note, createShare, askForPassword);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void createSecureFileDrop() {
+
+    }
+
     private void showShareLinkDialog() {
         String link = createInternalLink();
 
@@ -350,85 +311,25 @@ private String createInternalLink() {
         return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
-    // TODO: Capabilities in notes app doesn't have following functions...
-    public void createPublicShareLink() {
-        /*
-        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
-            // Is CreateShareViaLink operation compatible?
-
-            Intent service = new Intent(fileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
-            if (!TextUtils.isEmpty(password)) {
-                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            }
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-        }
-         */
-    }
-
-    public void createSecureFileDrop() {
-        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
-    }
-
-    /*
-    // TODO: Cant call getFileWithLink
-
-     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
-        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
-                                                                                       ShareType.PUBLIC_LINK,
-                                                                                       "");
-
-        if (shares.size() == SINGLE_LINK_SIZE) {
-            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
-        } else {
-            if (fileActivity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
-            } else {
-                showShareFile(file);
-            }
-        }
-
-        fileActivity.refreshList();
-    }
-     */
-    private void showSendLinkTo(OCShare publicShare) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(publicShare.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                // TODO: get link from public share and pass to the function
-                showShareLinkDialog();
-            }
-        }
-         */
-    }
-
+    @Override
     public void copyLink(OCShare share) {
         /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(share.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
             } else {
-                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+                ClipboardUtil.copyToClipboard(this, share.getShareLink());
             }
         }
          */
+
+        ClipboardUtil.copyToClipboard(this, share.getShareLink());
     }
 
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
         if (!this.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
+            new NoteShareActivityShareItemActionBottomSheetDialog(this, this, share).show();
         }
     }
 
@@ -437,41 +338,6 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
-    public void onUpdateShareInformation(RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            refreshUiFromDB();
-        } else {
-            setupView();
-        }
-    }
-
-    /**
-     * Get {@link OCShare} instance from DB and updates the UI.
-     */
-    private void refreshUiFromDB() {
-        refreshSharesFromDB();
-        // Updates UI with new state
-        setupView();
-    }
-
-    private void unshareWith(OCShare share) {
-        repository.removeShare(share.getId());
-    }
-
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
-     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
-     * @param askForPassword if true, password is optional
-     */
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
-                createShare,
-                askForPassword);
-        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
@@ -479,31 +345,15 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     }
 
     @Override
-    public void showProfileBottomSheet(User user, String shareWith) {
-        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            new RetrieveHoverCardAsyncTask(user,
-                    account,
-                    shareWith,
-                    this,
-                    clientFactory).execute();
-        }
+    public void showProfileBottomSheet(Account account, String shareWith) {
     }
 
-    /**
-     * Get known server capabilities from DB
-     */
     public void refreshCapabilitiesFromDB() {
-        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
-    /**
-     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
-     * before reading database.
-     */
     public void refreshSharesFromDB() {
-        new Thread(() -> {
+        executorService.schedule(() -> {
             try {
-                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
@@ -516,8 +366,8 @@ public void refreshSharesFromDB() {
                 // to show share with users/groups info
                 List<OCShare> shares = new ArrayList<>();
 
-                if (note != null && note.getRemoteId() != null) {
-                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
+                if (note != null) {
+                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
@@ -530,25 +380,26 @@ public void refreshSharesFromDB() {
 
                 runOnUiThread(() -> {
                     adapter.addShares(shares);
-
-                    // TODO: Will be added later on...
-                    List<OCShare> publicShares = new ArrayList<>();
-
-                    if (containsNoNewPublicShare(adapter.getShares())) {
-                        final OCShare ocShare = new OCShare();
-                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-                        publicShares.add(ocShare);
-                    } else {
-                        adapter.removeNewPublicShare();
-                    }
-
-                    adapter.addShares(publicShares);
+                    addPublicShares(adapter);
                 });
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
             }
-        }).start();
+        }, 0, TimeUnit.MICROSECONDS);
+    }
+
+    private void addPublicShares(ShareeListAdapter adapter) {
+        List<OCShare> publicShares = new ArrayList<>();
+
+        if (containsNoNewPublicShare(adapter.getShares())) {
+            final OCShare ocShare = new OCShare();
+            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+            publicShares.add(ocShare);
+        } else {
+            adapter.removeNewPublicShare();
+        }
 
+        adapter.addShares(publicShares);
     }
 
     private void checkContactPermission() {
@@ -621,7 +472,6 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
     private boolean isReshareForbidden(OCShare share) {
         return false;
-        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -643,24 +493,26 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        unshareWith(share);
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-        if (adapter == null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-            return;
-        }
-        adapter.remove(share);
+        executorService.schedule(() -> {
+            final var result = repository.removeShare(share.getId());
+
+            runOnUiThread(() -> {
+                if (result) {
+                    ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+                    if (adapter == null) {
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.email_pick_failed));
+                        return;
+                    }
+                    adapter.remove(share);
+                } else {
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
+                }
+            });
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override
     public void sendLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
-            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
-        } else {
-            showSendLinkTo(share);
-        }
-         */
     }
 
     @Override
@@ -674,19 +526,38 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
         bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
         bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
         bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
-        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, getExpDateShown());
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
         startActivity(intent);
     }
 
+    private boolean getExpDateShown() {
+        try {
+            if (capabilities == null) {
+                Log_OC.d(TAG, "Capabilities cannot be null");
+                return false;
+            }
+
+            final var majorVersionAsString = capabilities.getNextcloudMajorVersion();
+            if (majorVersionAsString != null) {
+                final var majorVersion = Integer.parseInt(majorVersionAsString);
+                return majorVersion >= 18;
+            }
+
+            return false;
+        } catch (NumberFormatException e) {
+            Log_OC.d(TAG, "Exception while getting expDateShown");
+            return false;
+        }
+    }
+
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
     }
 
-    //launcher for contact permission
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
@@ -697,7 +568,6 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 }
             });
 
-    //launcher to handle contact selection
     private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                     result -> {
@@ -728,4 +598,10 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
+
+    @Override
+    protected void onDestroy() {
+        executorService.shutdown();
+        super.onDestroy();
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index c9550cfe4..157a61be5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -14,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareShareBinding;
@@ -62,7 +63,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                                 false),
                         activity);
             }
-            /*
              case NEW_PUBLIC_LINK -> {
                 return new NewLinkShareViewHolder(
                         ItemAddPublicShareBinding.inflate(LayoutInflater.from(activity),
@@ -70,8 +70,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                                 false)
                 );
             }
-             */
-
             case INTERNAL -> {
                 return new InternalShareViewHolder(
                         ItemInternalShareLinkBinding.inflate(LayoutInflater.from(activity), parent, false),
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
index daecc2cc1..f3a5e1c6e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
@@ -84,7 +84,9 @@ private void setPermissionName(OCShare publicShare, String permissionName) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, context);
-        util.androidx.colorPrimaryTextViewElement(binding.permissionName);
-        util.platform.colorImageViewBackgroundAndIcon(binding.icon);
+        if (binding != null) {
+            util.androidx.colorPrimaryTextViewElement(binding.permissionName);
+            util.platform.colorImageViewBackgroundAndIcon(binding.icon);
+        }
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
index 52a6fff5a..8ae313b81 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareRequest.kt
@@ -17,11 +17,11 @@ data class CreateShareRequest(
     val publicUpload: String,
 
     @Expose
-    val password: String,
+    val password: String?,
 
     @Expose
-    val permissions: Int,
+    val permissions: Int?,
 
     @Expose
-    val note: String
+    val note: String?
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 2a85fcb97..69f890803 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -38,7 +38,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         return notesPathResponse.body()
     }
 
-    private fun getNotePath(note: Note): String? {
+    fun getNotePath(note: Note): String? {
         val notesPathResponseResult = getNotesPathResponseResult() ?: return null
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index 82bf7299b..efb9e4918 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -39,6 +39,25 @@ public class Capabilities implements Serializable {
 
     private boolean directEditingAvailable;
 
+    private boolean publicPasswordEnforced;
+    private boolean askForOptionalPassword;
+
+    public boolean getPublicPasswordEnforced() {
+        return publicPasswordEnforced;
+    }
+
+    public void setPublicPasswordEnforced(boolean value) {
+        this.publicPasswordEnforced = value;
+    }
+
+    public boolean getAskForOptionalPassword() {
+        return askForOptionalPassword;
+    }
+
+    public void setAskForOptionalPassword(boolean value) {
+        this.askForOptionalPassword = value;
+    }
+
     public void setApiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
     }
@@ -124,6 +143,8 @@ public String toString() {
                 ", nextcloudMinorVersion='" + nextcloudMinorVersion + '\'' +
                 ", nextcloudMicroVersion='" + nextcloudMicroVersion + '\'' +
                 ", federationShare=" + federationShare +
+                ", publicPasswordEnforced=" + publicPasswordEnforced +
+                ", askForOptionalPassword=" + askForOptionalPassword +
                 ", color=" + color +
                 ", textColor=" + textColor +
                 ", eTag='" + eTag + '\'' +

From 74b2d47015646d8d5cc240a9e9c08ea1934e3ba3 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:13:40 +0100
Subject: [PATCH 082/138] fix createPublicShareLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 4295b1896..8eb26fd20 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -277,7 +277,10 @@ public void createPublicShareLink() {
             requestPasswordForShareViaLink(true, capabilities.getAskForOptionalPassword());
         } else {
             executorService.schedule(() -> {
-                repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
+                final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
+                if (result != null) {
+                    runOnUiThread(this::recreate);
+                }
             }, 0, TimeUnit.MICROSECONDS);
         }
     }

From 95be6c1fbaeca242b86091d9bd4c3ec80ab0f2b4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:18:39 +0100
Subject: [PATCH 083/138] add copyAndShareFileLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java    | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 8eb26fd20..06de6b968 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -326,7 +326,19 @@ public void copyLink(OCShare share) {
         }
          */
 
-        ClipboardUtil.copyToClipboard(this, share.getShareLink());
+        if (TextUtils.isEmpty(share.getShareLink())) {
+            copyAndShareFileLink(share.getShareLink());
+        } else {
+            ClipboardUtil.copyToClipboard(this, share.getShareLink());
+        }
+    }
+
+    private void copyAndShareFileLink(String link) {
+        ClipboardUtil.copyToClipboard(this, link, false);
+        Snackbar snackbar = Snackbar
+                .make(this.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG)
+                .setAction(R.string.share, v -> showShareLinkDialog());
+        snackbar.show();
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 944bfa5c3..1d238f50a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,6 +126,7 @@
     <string name="share_known_remote_on_clarification">on %1$s</string>
 
     <string name="copy_link">Copy link</string>
+    <string name="share">Share</string>
     <string name="clipboard_text_copied">Link copied</string>
     <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>
     <string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>

From a2b285bd36f95df7dd0d0a3e6ecd8d681ff58db6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:20:48 +0100
Subject: [PATCH 084/138] clean imports

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 06de6b968..ea1b29236 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -29,7 +29,6 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
@@ -56,7 +55,6 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.CreateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;

From 876f99709fa192d15b6935fddb2c260c921f2988 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:26:51 +0100
Subject: [PATCH 085/138] add fix me

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ea1b29236..3f5183085 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -260,7 +260,8 @@ public void copyInternalLink() {
             return;
         }
 
-        showShareLinkDialog();
+        final var link = createInternalLink();
+        showShareLinkDialog(link);
     }
 
     @Override
@@ -293,9 +294,7 @@ public void createSecureFileDrop() {
 
     }
 
-    private void showShareLinkDialog() {
-        String link = createInternalLink();
-
+    private void showShareLinkDialog(String link) {
         Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
 
         intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
@@ -324,6 +323,7 @@ public void copyLink(OCShare share) {
         }
          */
 
+        // FIXME: getShareLink is empty
         if (TextUtils.isEmpty(share.getShareLink())) {
             copyAndShareFileLink(share.getShareLink());
         } else {
@@ -335,7 +335,7 @@ private void copyAndShareFileLink(String link) {
         ClipboardUtil.copyToClipboard(this, link, false);
         Snackbar snackbar = Snackbar
                 .make(this.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG)
-                .setAction(R.string.share, v -> showShareLinkDialog());
+                .setAction(R.string.share, v -> showShareLinkDialog(link));
         snackbar.show();
     }
 

From ae004901f8c0df4b9cf774abd0fd90d78ba9282d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:48:45 +0100
Subject: [PATCH 086/138] add missing field for oc share

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/persistence/entity/ShareEntity.kt |  1 +
 .../owncloud/notes/share/NoteShareActivity.java      |  1 -
 .../notes/share/model/CreateShareResponse.kt         | 12 ++++++++++++
 .../share/model/CreateShareResponseExtensions.kt     |  6 +++---
 .../notes/share/repository/ShareRepository.kt        |  4 +++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
index 4d0f226f4..943a5e6aa 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
@@ -18,4 +18,5 @@ data class ShareEntity(
     val displayname_file_owner: String? = null,
     val uid_owner: String? = null,
     val displayname_owner: String? = null,
+    val url: String? = null
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 3f5183085..47fb3b56b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -323,7 +323,6 @@ public void copyLink(OCShare share) {
         }
          */
 
-        // FIXME: getShareLink is empty
         if (TextUtils.isEmpty(share.getShareLink())) {
             copyAndShareFileLink(share.getShareLink());
         } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
index 1d39649e3..28aef0a38 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponse.kt
@@ -122,4 +122,16 @@ data class CreateShareResponse(
 
     @Expose
     val attributes: Any?,
+
+    @Expose
+    @SerializedName("url")
+    val url: String?,
+
+    @Expose
+    @SerializedName("token")
+    val token: String?,
+
+    @Expose
+    @SerializedName("password")
+    val password: String?
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
index c3646c4ff..e6eb6bc6a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -19,12 +19,12 @@ fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
             path = response.path
             permissions = response.permissions.toInt()
             sharedDate = response.stime
-            token = null
+            token = response.token
             sharedWithDisplayName = response.shareWithDisplayname
             isFolder = response.itemType == "folder"
             userId = response.uidOwner
-            shareLink = null
-            isPasswordProtected = false
+            shareLink =  response.url
+            isPasswordProtected = !response.password.isNullOrEmpty()
             note = response.note
             isHideFileDownload = response.hideDownload > 0
             label = response.label
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 69f890803..b147b1e5c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -75,6 +75,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
                     val displayNameFileOwner = map?.get("displayname_file_owner") as? String
                     val uidOwner = map?.get("uid_owner") as? String
                     val displayNameOwner = map?.get("displayname_owner") as? String
+                    val url = map?.get("url") as? String
 
                     id?.toInt()?.let {
                         val entity = ShareEntity(
@@ -87,7 +88,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
                             uid_file_owner = uidFileOwner,
                             displayname_file_owner = displayNameFileOwner,
                             uid_owner = uidOwner,
-                            displayname_owner = displayNameOwner
+                            displayname_owner = displayNameOwner,
+                            url = url
                         )
 
                         entities.add(entity)

From 96d05c3895a703e8752f71d67134b1b7ffdff677 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 6 Feb 2025 10:04:06 +0100
Subject: [PATCH 087/138] add isSharedViaLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/edit/BaseNoteFragment.java |  2 +-
 .../owncloud/notes/edit/EditNoteActivity.java |  2 +-
 .../notes/persistence/NotesRepository.java    | 12 ++++++----
 .../notes/persistence/dao/NoteDao.java        | 18 +++++++-------
 .../notes/persistence/entity/Note.java        | 24 ++++++++++++++++---
 .../notes/share/NoteShareActivity.java        | 14 ++++-------
 .../notes/share/repository/ShareRepository.kt | 14 +++++++----
 7 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index b7011fbb9..fbbf86c2a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -122,7 +122,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                             if (content == null) {
                                 throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing.");
                             } else {
-                                note = new Note(-1, null, Calendar.getInstance(), NoteUtil.generateNoteTitle(content), content, getString(R.string.category_readonly), false, null, DBStatus.VOID, -1, "", 0);
+                                note = new Note(-1, null, Calendar.getInstance(), NoteUtil.generateNoteTitle(content), content, getString(R.string.category_readonly), false, null, DBStatus.VOID, -1, "", 0, false);
                                 requireActivity().runOnUiThread(() -> onNoteLoaded(note));
                                 requireActivity().invalidateOptionsMenu();
                             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index cb59994eb..345b278d7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -302,7 +302,7 @@ private void launchNewNote() {
         if (content == null) {
             content = "";
         }
-        final var newNote = new Note(null, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, categoryTitle, favorite, null);
+        final var newNote = new Note(null, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, categoryTitle, favorite, null, false);
         fragment = getNewNoteFragment(newNote);
         replaceFragment();
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 11a0ffa00..6f54244d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -480,7 +480,7 @@ public NotesListWidgetData getNoteListWidgetData(int appWidgetId) {
     @NonNull
     @MainThread
     public LiveData<Note> addNoteAndSync(Account account, Note note) {
-        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0);
+        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0, note.isSharedViaLink());
         final var ret = new MutableLiveData<Note>();
         executor.submit(() -> ret.postValue(addNote(account.getId(), entity)));
         return map(ret, newNote -> {
@@ -508,7 +508,7 @@ public Note addNote(long accountId, @NonNull Note note) {
 
     @MainThread
     public LiveData<Note> moveNoteToAnotherAccount(Account account, @NonNull Note note) {
-        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null);
+        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null, note.isSharedViaLink());
         fullNote.setStatus(DBStatus.LOCAL_EDITED);
         deleteNoteAndSync(account, note.getId());
         return addNoteAndSync(account, fullNote);
@@ -570,7 +570,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
         // https://github.com/nextcloud/notes-android/issues/1198
         @Nullable final Long remoteId = db.getNoteDao().getRemoteId(oldNote.getId());
         if (newContent == null) {
-            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY());
+            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY(), oldNote.isSharedViaLink());
         } else {
             final String title;
             if (newTitle != null) {
@@ -584,7 +584,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
                     title = oldNote.getTitle();
                 }
             }
-            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY());
+            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY(), oldNote.isSharedViaLink());
         }
         int rows = db.getNoteDao().updateNote(newNote);
         // if data was changed, set new status and schedule sync (with callback); otherwise invoke callback directly.
@@ -974,4 +974,8 @@ public void addShareEntities(List<ShareEntity> entities) {
     public List<ShareEntity> getShareEntities(String path) {
         return db.getShareDao().getShareEntities(path);
     }
+
+    public void updateNote(Note note) {
+        db.getNoteDao().updateNote(note);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
index 07b7e4f4a..7b475c5c7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
@@ -38,14 +38,14 @@ public interface NoteDao {
     String getNoteById = "SELECT * FROM NOTE WHERE id = :id";
     String count = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId";
     String countFavorites = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId AND favorite = 1";
-    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
-    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
-    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
-    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
-    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
-    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
+    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
+    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
+    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
+    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
+    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
 
     @Query(getNoteById)
     LiveData<Note> getNoteById$(long id);
@@ -141,7 +141,7 @@ public interface NoteDao {
      * Gets a list of {@link Note} objects with filled {@link Note#id} and {@link Note#remoteId},
      * where {@link Note#remoteId} is not <code>null</code>
      */
-    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
+    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, 0 as share_by_link, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
     List<Note> getRemoteIdAndId(long accountId);
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
index 886eb8786..7b8285670 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
@@ -38,6 +38,7 @@
                 @Index(name = "IDX_NOTE_ACCOUNTID", value = "accountId"),
                 @Index(name = "IDX_NOTE_CATEGORY", value = "category"),
                 @Index(name = "IDX_NOTE_FAVORITE", value = "favorite"),
+                @Index(name = "IDX_NOTE_IS_SHARED_VIA_LINK", value = "share_by_link"),
                 @Index(name = "IDX_NOTE_MODIFIED", value = "modified"),
                 @Index(name = "IDX_NOTE_REMOTEID", value = "remoteId"),
                 @Index(name = "IDX_NOTE_STATUS", value = "status")
@@ -81,6 +82,11 @@ public class Note implements Serializable, Item {
     @ColumnInfo(defaultValue = "0")
     private boolean favorite = false;
 
+    @Expose
+    @ColumnInfo(defaultValue = "0", name = "share_by_link")
+    @SerializedName("share_by_link")
+    private boolean isSharedViaLink = false;
+
     @Expose
     @Nullable
     @SerializedName("etag")
@@ -98,7 +104,7 @@ public Note() {
     }
 
     @Ignore
-    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag) {
+    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isSharedViaLink) {
         this.remoteId = remoteId;
         this.title = title;
         this.modified = modified;
@@ -106,11 +112,12 @@ public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull Strin
         this.favorite = favorite;
         this.category = category;
         this.eTag = eTag;
+        this.isSharedViaLink = isSharedViaLink;
     }
 
     @Ignore
-    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY) {
-        this(remoteId, modified, title, content, category, favorite, etag);
+    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isSharedViaLink) {
+        this(remoteId, modified, title, content, category, favorite, etag, isSharedViaLink);
         this.id = id;
         this.status = status;
         this.accountId = accountId;
@@ -126,6 +133,14 @@ public void setId(long id) {
         this.id = id;
     }
 
+    public boolean isSharedViaLink() {
+        return isSharedViaLink;
+    }
+
+    public void setIsSharedViaLink(boolean value) {
+        this.isSharedViaLink = value;
+    }
+
     @NonNull
     public String getCategory() {
         return category;
@@ -230,6 +245,7 @@ public boolean equals(Object o) {
         if (id != note.id) return false;
         if (accountId != note.accountId) return false;
         if (favorite != note.favorite) return false;
+        if (isSharedViaLink != note.isSharedViaLink) return false;
         if (scrollY != note.scrollY) return false;
         if (!Objects.equals(remoteId, note.remoteId))
             return false;
@@ -254,6 +270,7 @@ public int hashCode() {
         result = 31 * result + (modified != null ? modified.hashCode() : 0);
         result = 31 * result + content.hashCode();
         result = 31 * result + (favorite ? 1 : 0);
+        result = 31 * result + (isSharedViaLink ? 1 : 0);
         result = 31 * result + (eTag != null ? eTag.hashCode() : 0);
         result = 31 * result + excerpt.hashCode();
         result = 31 * result + scrollY;
@@ -273,6 +290,7 @@ public String toString() {
                 ", modified=" + modified +
                 ", content='" + content + '\'' +
                 ", favorite=" + favorite +
+                ", share_by_link=" + isSharedViaLink +
                 ", eTag='" + eTag + '\'' +
                 ", excerpt='" + excerpt + '\'' +
                 ", scrollY=" + scrollY +
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 47fb3b56b..60e620a42 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -278,6 +278,8 @@ public void createPublicShareLink() {
             executorService.schedule(() -> {
                 final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
                 if (result != null) {
+                    note.setIsSharedViaLink(true);
+                    repository.updateNote(note);
                     runOnUiThread(this::recreate);
                 }
             }, 0, TimeUnit.MICROSECONDS);
@@ -313,15 +315,9 @@ private String createInternalLink() {
 
     @Override
     public void copyLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(share.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                ClipboardUtil.copyToClipboard(this, share.getShareLink());
-            }
+        if (!note.isSharedViaLink()) {
+            return;
         }
-         */
 
         if (TextUtils.isEmpty(share.getShareLink())) {
             copyAndShareFileLink(share.getShareLink());
@@ -506,7 +502,7 @@ public void sendNewEmail(OCShare share) {
     @Override
     public void unShare(OCShare share) {
         executorService.schedule(() -> {
-            final var result = repository.removeShare(share.getId());
+            final var result = repository.removeShare(share, note);
 
             runOnUiThread(() -> {
                 if (result) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index b147b1e5c..480f3ef8e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -194,15 +194,19 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    fun removeShare(
-        shareId: Long
-    ): Boolean {
+    fun removeShare(share: OCShare, note: Note): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
 
         return try {
-            val call = shareAPI.removeShare(shareId)
+            val call = shareAPI.removeShare(share.id)
             val response = call.execute()
             if (response.isSuccessful) {
+
+                if (share.shareType == ShareType.PUBLIC_LINK) {
+                    note.setIsSharedViaLink(false)
+                    updateNote(note)
+                }
+
                 Log_OC.d(tag, "Share removed successfully.")
             } else {
                 Log_OC.d(tag, "Failed to remove share: ${response.errorBody()?.string()}")
@@ -232,6 +236,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun updateNote(note: Note) = notesRepository.updateNote(note)
+
     fun addShare(
         note: Note,
         shareType: ShareType,

From a715566b3b19fe95f947280dd2dce9e002035812 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 6 Feb 2025 10:11:38 +0100
Subject: [PATCH 088/138] fix json parsing

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/NotesRepository.java    |  8 ++---
 .../notes/persistence/dao/NoteDao.java        | 18 ++++++------
 .../notes/persistence/entity/Note.java        | 29 +++++++++----------
 .../notes/share/NoteShareActivity.java        |  4 +--
 .../notes/share/repository/ShareRepository.kt |  2 +-
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 6f54244d2..fa9eb594d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -480,7 +480,7 @@ public NotesListWidgetData getNoteListWidgetData(int appWidgetId) {
     @NonNull
     @MainThread
     public LiveData<Note> addNoteAndSync(Account account, Note note) {
-        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0, note.isSharedViaLink());
+        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0, note.isShared());
         final var ret = new MutableLiveData<Note>();
         executor.submit(() -> ret.postValue(addNote(account.getId(), entity)));
         return map(ret, newNote -> {
@@ -508,7 +508,7 @@ public Note addNote(long accountId, @NonNull Note note) {
 
     @MainThread
     public LiveData<Note> moveNoteToAnotherAccount(Account account, @NonNull Note note) {
-        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null, note.isSharedViaLink());
+        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null, note.isShared());
         fullNote.setStatus(DBStatus.LOCAL_EDITED);
         deleteNoteAndSync(account, note.getId());
         return addNoteAndSync(account, fullNote);
@@ -570,7 +570,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
         // https://github.com/nextcloud/notes-android/issues/1198
         @Nullable final Long remoteId = db.getNoteDao().getRemoteId(oldNote.getId());
         if (newContent == null) {
-            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY(), oldNote.isSharedViaLink());
+            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY(), oldNote.isShared());
         } else {
             final String title;
             if (newTitle != null) {
@@ -584,7 +584,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
                     title = oldNote.getTitle();
                 }
             }
-            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY(), oldNote.isSharedViaLink());
+            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY(), oldNote.isShared());
         }
         int rows = db.getNoteDao().updateNote(newNote);
         // if data was changed, set new status and schedule sync (with callback); otherwise invoke callback directly.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
index 7b475c5c7..2f04c77e9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
@@ -38,14 +38,14 @@ public interface NoteDao {
     String getNoteById = "SELECT * FROM NOTE WHERE id = :id";
     String count = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId";
     String countFavorites = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId AND favorite = 1";
-    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
-    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
-    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
-    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
-    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
-    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, share_by_link, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
+    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
+    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
+    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
+    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
+    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
 
     @Query(getNoteById)
     LiveData<Note> getNoteById$(long id);
@@ -141,7 +141,7 @@ public interface NoteDao {
      * Gets a list of {@link Note} objects with filled {@link Note#id} and {@link Note#remoteId},
      * where {@link Note#remoteId} is not <code>null</code>
      */
-    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, 0 as share_by_link, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
+    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, 0 as isShared, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
     List<Note> getRemoteIdAndId(long accountId);
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
index 7b8285670..84756ebbc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
@@ -38,7 +38,7 @@
                 @Index(name = "IDX_NOTE_ACCOUNTID", value = "accountId"),
                 @Index(name = "IDX_NOTE_CATEGORY", value = "category"),
                 @Index(name = "IDX_NOTE_FAVORITE", value = "favorite"),
-                @Index(name = "IDX_NOTE_IS_SHARED_VIA_LINK", value = "share_by_link"),
+                @Index(name = "IDX_NOTE_IS_SHARED", value = "isShared"),
                 @Index(name = "IDX_NOTE_MODIFIED", value = "modified"),
                 @Index(name = "IDX_NOTE_REMOTEID", value = "remoteId"),
                 @Index(name = "IDX_NOTE_STATUS", value = "status")
@@ -83,9 +83,8 @@ public class Note implements Serializable, Item {
     private boolean favorite = false;
 
     @Expose
-    @ColumnInfo(defaultValue = "0", name = "share_by_link")
-    @SerializedName("share_by_link")
-    private boolean isSharedViaLink = false;
+    @ColumnInfo(defaultValue = "0")
+    private boolean isShared = false;
 
     @Expose
     @Nullable
@@ -104,7 +103,7 @@ public Note() {
     }
 
     @Ignore
-    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isSharedViaLink) {
+    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isShared) {
         this.remoteId = remoteId;
         this.title = title;
         this.modified = modified;
@@ -112,12 +111,12 @@ public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull Strin
         this.favorite = favorite;
         this.category = category;
         this.eTag = eTag;
-        this.isSharedViaLink = isSharedViaLink;
+        this.isShared = isShared;
     }
 
     @Ignore
-    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isSharedViaLink) {
-        this(remoteId, modified, title, content, category, favorite, etag, isSharedViaLink);
+    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isShared) {
+        this(remoteId, modified, title, content, category, favorite, etag, isShared);
         this.id = id;
         this.status = status;
         this.accountId = accountId;
@@ -133,12 +132,12 @@ public void setId(long id) {
         this.id = id;
     }
 
-    public boolean isSharedViaLink() {
-        return isSharedViaLink;
+    public boolean isShared() {
+        return isShared;
     }
 
-    public void setIsSharedViaLink(boolean value) {
-        this.isSharedViaLink = value;
+    public void setIsShared(boolean value) {
+        this.isShared = value;
     }
 
     @NonNull
@@ -245,7 +244,7 @@ public boolean equals(Object o) {
         if (id != note.id) return false;
         if (accountId != note.accountId) return false;
         if (favorite != note.favorite) return false;
-        if (isSharedViaLink != note.isSharedViaLink) return false;
+        if (isShared != note.isShared) return false;
         if (scrollY != note.scrollY) return false;
         if (!Objects.equals(remoteId, note.remoteId))
             return false;
@@ -270,7 +269,7 @@ public int hashCode() {
         result = 31 * result + (modified != null ? modified.hashCode() : 0);
         result = 31 * result + content.hashCode();
         result = 31 * result + (favorite ? 1 : 0);
-        result = 31 * result + (isSharedViaLink ? 1 : 0);
+        result = 31 * result + (isShared ? 1 : 0);
         result = 31 * result + (eTag != null ? eTag.hashCode() : 0);
         result = 31 * result + excerpt.hashCode();
         result = 31 * result + scrollY;
@@ -290,7 +289,7 @@ public String toString() {
                 ", modified=" + modified +
                 ", content='" + content + '\'' +
                 ", favorite=" + favorite +
-                ", share_by_link=" + isSharedViaLink +
+                ", isShared=" + isShared +
                 ", eTag='" + eTag + '\'' +
                 ", excerpt='" + excerpt + '\'' +
                 ", scrollY=" + scrollY +
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 60e620a42..0401416eb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -278,7 +278,7 @@ public void createPublicShareLink() {
             executorService.schedule(() -> {
                 final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
                 if (result != null) {
-                    note.setIsSharedViaLink(true);
+                    note.setIsShared(true);
                     repository.updateNote(note);
                     runOnUiThread(this::recreate);
                 }
@@ -315,7 +315,7 @@ private String createInternalLink() {
 
     @Override
     public void copyLink(OCShare share) {
-        if (!note.isSharedViaLink()) {
+        if (!note.isShared()) {
             return;
         }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 480f3ef8e..f62652193 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -203,7 +203,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
             if (response.isSuccessful) {
 
                 if (share.shareType == ShareType.PUBLIC_LINK) {
-                    note.setIsSharedViaLink(false)
+                    note.setIsShared(false)
                     updateNote(note)
                 }
 

From b71874ba5ad99a123a86fd1c2a1c5c1f936e77ae Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 14 Feb 2025 10:15:37 +0100
Subject: [PATCH 089/138] fix git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |   4 +-
 .../notes/persistence/dao/ShareDao.kt         |  10 +-
 .../notes/share/ClientFactoryImpl.java        |  84 ---
 .../share/CreateShareViaLinkOperation.java    |  91 ---
 .../notes/share/NoteShareFragment.java        | 692 ------------------
 .../owncloud/notes/share/SyncOperation.java   |  37 -
 .../owncloud/notes/shared/server/Server.kt    |  40 -
 .../owncloud/notes/shared/user/User.kt        |  56 --
 .../notes/shared/util/ClipboardUtil.kt        |  50 --
 app/src/main/res/layout/activity_row.xml      |   2 +-
 app/src/main/res/values/strings.xml           |  76 +-
 gradle/verification-metadata.xml              |  17 +
 12 files changed, 78 insertions(+), 1081 deletions(-)
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt

diff --git a/app/build.gradle b/app/build.gradle
index 513be6a83..088e7628a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,7 +122,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.fragment:fragment:1.8.5'
+    implementation 'androidx.fragment:fragment:1.8.6'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
@@ -139,7 +139,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.11.0'
 
     // Gson
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.12.1'
 
     // ReactiveX
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 97f27cac0..15ab98f80 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Insert
-    fun addShareEntity(entity: ShareEntity)
-
-    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
-    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
+    @Query("SELECT * FROM share_table WHERE path = :path")
+    fun getShareEntities(path: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
deleted file mode 100644
index b9c82d25e..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-
-package it.niedermann.owncloud.notes.share.operations;
-
-import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.PlainClient;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-
-import java.io.IOException;
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-public class ClientFactoryImpl implements ClientFactory {
-
-    private Context context;
-
-    public ClientFactoryImpl(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public OwnCloudClient create(User user) throws CreationException {
-        try {
-            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
-        } catch (OperationCanceledException |
-            AuthenticatorException |
-            IOException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public NextcloudClient createNextcloudClient(User user) throws CreationException {
-        try {
-            return OwnCloudClientFactory.createNextcloudClient(user, context);
-        } catch (AccountUtils.AccountNotFoundException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public OwnCloudClient create(Account account)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context);
-    }
-
-    @Override
-    public OwnCloudClient create(Account account, Activity currentActivity)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public PlainClient createPlainClient() {
-        return new PlainClient(context);
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
deleted file mode 100644
index 509fce819..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-import java.util.ArrayList;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-/**
- * Creates a new public share for a given file
- */
-public class CreateShareViaLinkOperation extends SyncOperation {
-
-    private final String path;
-    private final String password;
-    private int permissions = OCShare.NO_PERMISSION;
-
-    public CreateShareViaLinkOperation(String path, String password, User user) {
-        super(user);
-
-        this.path = path;
-        this.password = password;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
-                ShareType.PUBLIC_LINK,
-                "",
-                false,
-                password,
-                permissions);
-        createOp.setGetShareDetails(true);
-        RemoteOperationResult result = createOp.execute(client);
-
-        if (result.isSuccess()) {
-            if (result.getData().size() > 0) {
-                Object item = result.getData().get(0);
-                if (item instanceof OCShare) {
-                    updateData((OCShare) item);
-                } else {
-                    ArrayList<Object> data = result.getData();
-                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-                    result.setData(data);
-                }
-            } else {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-            }
-        }
-
-        return result;
-    }
-
-    private void updateData(OCShare share) {
-        // Update DB with the response
-        share.setPath(path);
-        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setFolder(true);
-        } else {
-            share.setFolder(false);
-        }
-
-        // TODO: Save share
-
-        /*
-        getStorageManager().saveShare(share);
-
-        // Update OCFile with data from share: ShareByLink  and publicLink
-        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
-        if (file != null) {
-            file.setSharedViaLink(true);
-            getStorageManager().saveFile(file);
-        }
-         */
-
-    }
-
-    public String getPath() {
-        return this.path;
-    }
-
-    public String getPassword() {
-        return this.password;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
deleted file mode 100644
index 759c8a8f0..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ /dev/null
@@ -1,692 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.SearchManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.widget.SearchView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.google.android.material.snackbar.Snackbar;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.NextcloudVersion;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
-import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
-import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
-import it.niedermann.owncloud.notes.persistence.entity.Account;
-import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
-import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
-import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
-import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
-import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
-import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
-import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
-import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
-
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
-
-    private static final String TAG = "NoteShareFragment";
-    private static final String ARG_NOTE = "NOTE";
-    private static final String ARG_ACCOUNT = "ACCOUNT";
-    private static final String ARG_USER = "USER";
-    public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
-
-    private FragmentNoteShareBinding binding;
-    private Note note;
-    private User user;
-    private Account account;
-
-    private OnEditShareListener onEditShareListener;
-    private ClientFactoryImpl clientFactory;
-
-    public static NoteShareFragment newInstance(Note note, User user, Account account) {
-        NoteShareFragment fragment = new NoteShareFragment();
-        Bundle args = new Bundle();
-        args.putSerializable(ARG_NOTE, note);
-        args.putSerializable(ARG_ACCOUNT, account);
-        args.putParcelable(ARG_USER, user);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        clientFactory = new ClientFactoryImpl(requireContext());
-
-        if (savedInstanceState != null) {
-            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
-            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
-            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
-        } else {
-            Bundle arguments = getArguments();
-            if (arguments != null) {
-                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
-                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
-                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
-            }
-        }
-
-        if (note == null) {
-            throw new IllegalArgumentException("Note cannot be null");
-        }
-
-        if (user == null) {
-            throw new IllegalArgumentException("Account cannot be null");
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        refreshCapabilitiesFromDB();
-        refreshSharesFromDB();
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
-
-        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
-                new ArrayList<>(),
-                this,
-                user,
-                account));
-
-        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
-
-        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
-
-        setupView();
-
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        try {
-            onEditShareListener = (OnEditShareListener) context;
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Calling activity must implement the interface", e);
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        UsersAndGroupsSearchConfig.INSTANCE.reset();
-    }
-
-    private void setupView() {
-        setShareWithYou();
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
-        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
-        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
-
-        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-        binding.searchView.setInputType(InputType.TYPE_NULL);
-        binding.pickContactEmailBtn.setVisibility(View.GONE);
-        disableSearchView(binding.searchView);
-
-        /*
-        if (file.canReshare()) {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
-        } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-            binding.searchView.setInputType(InputType.TYPE_NULL);
-            binding.pickContactEmailBtn.setVisibility(View.GONE);
-            disableSearchView(binding.searchView);
-        }
-         */
-
-    }
-
-    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
-                                       ComponentName componentName) {
-        if (searchManager == null) {
-            searchView.setVisibility(View.GONE);
-            return;
-        }
-
-        // assumes parent activity is the searchable activity
-        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
-
-        // do not iconify the widget; expand it by default
-        searchView.setIconifiedByDefault(false);
-
-        // avoid fullscreen with softkeyboard
-        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
-
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                // return true to prevent the query from being processed;
-                return true;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                // leave it for the parent listener in the hierarchy / default behaviour
-                return false;
-            }
-        });
-    }
-
-    private void disableSearchView(View view) {
-        view.setEnabled(false);
-
-        if (view instanceof ViewGroup viewGroup) {
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                disableSearchView(viewGroup.getChildAt(i));
-            }
-        }
-    }
-
-    // TODO: Check if note.getAccountId() return note's owner's id
-    private boolean accountOwnsFile() {
-        String noteId = String.valueOf(note.getAccountId());
-        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
-    }
-
-    private void setShareWithYou() {
-        if (accountOwnsFile()) {
-            binding.sharedWithYouContainer.setVisibility(View.GONE);
-        } else {
-
-            /*
-            // TODO: How to get owner display name from note?
-
-             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
-             */
-
-
-            Glide.with(this)
-                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                    .error(R.drawable.ic_account_circle_grey_24dp)
-                    .apply(RequestOptions.circleCropTransform())
-                    .into(binding.sharedWithYouAvatar);
-
-            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
-
-            /*
-            // TODO: Note's note?
-            String note = file.getNote();
-
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
-            }
-             */
-        }
-    }
-
-    public void copyInternalLink() {
-        if (account == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
-                    .setAnchorView(binding.sharesList)
-                    .show();
-            return;
-        }
-
-        showShareLinkDialog();
-    }
-
-    private void showShareLinkDialog() {
-        String link = createInternalLink();
-
-        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
-
-        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
-        intentToShareLink.setType("text/plain");
-        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
-
-        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
-        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
-    }
-
-    // TODO: Check account.getUrl returning base url?
-    private String createInternalLink() {
-        Uri baseUri = Uri.parse(account.getUrl());
-        return baseUri + "/index.php/f/" +  note.getId();
-    }
-
-    // TODO: Capabilities in notes app doesn't have following functions...
-    public void createPublicShareLink() {
-        /*
-        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
-            // Is CreateShareViaLink operation compatible?
-
-            Intent service = new Intent(fileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
-            if (!TextUtils.isEmpty(password)) {
-                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            }
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-        }
-         */
-
-    }
-
-    public void createSecureFileDrop() {
-        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
-    }
-
-    /*
-    // TODO: Cant call getFileWithLink
-
-     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
-        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
-                                                                                       ShareType.PUBLIC_LINK,
-                                                                                       "");
-
-        if (shares.size() == SINGLE_LINK_SIZE) {
-            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
-        } else {
-            if (fileActivity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
-            } else {
-                showShareFile(file);
-            }
-        }
-
-        fileActivity.refreshList();
-    }
-     */
-    private void showSendLinkTo(OCShare publicShare) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(publicShare.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                // TODO: get link from public share and pass to the function
-                showShareLinkDialog();
-            }
-        }
-         */
-
-    }
-
-    public void copyLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(share.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
-            }
-        }
-         */
-
-    }
-
-    @Override
-    public void showSharingMenuActionSheet(OCShare share) {
-        if (getActivity() != null && !getActivity().isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
-        }
-    }
-
-    @Override
-    public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
-    }
-
-    public void onUpdateShareInformation(RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            refreshUiFromDB();
-        } else {
-            setupView();
-        }
-    }
-
-    /**
-     * Get {@link OCShare} instance from DB and updates the UI.
-     */
-    private void refreshUiFromDB() {
-        refreshSharesFromDB();
-        // Updates UI with new state
-        setupView();
-    }
-
-    private void unshareWith(OCShare share) {
-        // fileOperationsHelper.unshareShare(file, share);
-    }
-
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
-     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
-     * @param askForPassword if true, password is optional
-     */
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
-                createShare,
-                askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
-    @Override
-    public void requestPasswordForShare(OCShare share, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
-    @Override
-    public void showProfileBottomSheet(User user, String shareWith) {
-        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            new RetrieveHoverCardAsyncTask(user,
-                    account,
-                    shareWith,
-                    getActivity(),
-                    clientFactory).execute();
-        }
-    }
-
-    /**
-     * Get known server capabilities from DB
-     */
-    public void refreshCapabilitiesFromDB() {
-        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
-    }
-
-    /**
-     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
-     * before reading database.
-     */
-    public void refreshSharesFromDB() {
-        /*
-        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
-        if (newFile != null) {
-            file = newFile;
-        }
-
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-
-        if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
-                    .show();
-            return;
-        }
-        adapter.getShares().clear();
-
-        // to show share with users/groups info
-        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
-                user.getAccountName());
-
-        adapter.addShares(shares);
-
-        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
-            return;
-        }
-
-        // Get public share
-        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
-                ShareType.PUBLIC_LINK,
-                "");
-
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
-            final OCShare ocShare = new OCShare();
-            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-            publicShares.add(ocShare);
-        } else {
-            adapter.removeNewPublicShare();
-        }
-
-        adapter.addShares(publicShares);
-         */
-
-    }
-
-    private void checkContactPermission() {
-        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
-            pickContactEmail();
-        } else {
-            requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
-        }
-    }
-
-    private void pickContactEmail() {
-        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
-
-        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
-            onContactSelectionResultLauncher.launch(intent);
-        } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
-                    .show();
-        }
-    }
-
-    private void handleContactResult(@NonNull Uri contactUri) {
-        // Define the projection to get all email addresses.
-        String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
-
-        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                // The contact has only one email address, use it.
-                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
-                if (columnIndex != -1) {
-                    // Use the email address as needed.
-                    // email variable contains the selected contact's email address.
-                    String email = cursor.getString(columnIndex);
-                    binding.searchView.post(() -> {
-                        binding.searchView.setQuery(email, false);
-                        binding.searchView.requestFocus();
-                    });
-                } else {
-                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                            .show();
-                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
-                }
-            } else {
-                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                        .show();
-                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
-            }
-            cursor.close();
-        } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
-            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
-        }
-    }
-
-    private boolean containsNoNewPublicShare(List<OCShare> shares) {
-        for (OCShare share : shares) {
-            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putSerializable(ARG_NOTE, note);
-        outState.putSerializable(ARG_ACCOUNT, account);
-        outState.putParcelable(ARG_USER, user);
-    }
-
-    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
-        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
-    }
-
-    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
-        return false;
-    }
-
-    private boolean isReshareForbidden(OCShare share) {
-        return false;
-        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
-    }
-
-    @VisibleForTesting
-    public void search(String query) {
-        SearchView searchView = requireView().findViewById(R.id.searchView);
-        searchView.setQuery(query, true);
-    }
-
-    @Override
-    public void advancedPermissions(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
-    }
-
-
-    @Override
-    public void sendNewEmail(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
-    }
-
-    @Override
-    public void unShare(OCShare share) {
-        unshareWith(share);
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-        if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
-            return;
-        }
-        adapter.remove(share);
-    }
-
-    @Override
-    public void sendLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
-            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
-        } else {
-            showSendLinkTo(share);
-        }
-         */
-
-    }
-
-    @Override
-    public void addAnotherLink(OCShare share) {
-        createPublicShareLink();
-    }
-
-    private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
-    }
-
-    @Override
-    public void onQuickPermissionChanged(OCShare share, int permission) {
-       // fileOperationsHelper.setPermissionsToShare(share, permission);
-    }
-
-    //launcher for contact permission
-    private final ActivityResultLauncher<String> requestContactPermissionLauncher =
-            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
-                if (isGranted) {
-                    pickContactEmail();
-                } else {
-                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
-                            .show();
-                }
-            });
-
-    //launcher to handle contact selection
-    private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
-            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-                    result -> {
-                        if (result.getResultCode() == Activity.RESULT_OK) {
-                            Intent intent = result.getData();
-                            if (intent == null) {
-                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                                        .show();
-                                return;
-                            }
-
-                            Uri contactUri = intent.getData();
-                            if (contactUri == null) {
-                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                                        .show();
-                                return;
-                            }
-
-                            handleContactResult(contactUri);
-
-                        }
-                    });
-
-    public interface OnEditShareListener {
-        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                               boolean isExpiryDateShown);
-
-        void onShareProcessClosed();
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
deleted file mode 100644
index 62eb8661a..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-
-import android.content.Context;
-import android.os.Handler;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.User;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-
-import androidx.annotation.NonNull;
-
-public abstract class SyncOperation extends RemoteOperation {
-    private final User user;
-
-    public SyncOperation(@NonNull User user) {
-        this.user = user;
-    }
-
-    public RemoteOperationResult execute(Context context) {
-        return super.execute(user, context);
-    }
-
-    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
-        return run(client);
-    }
-
-    public Thread execute(OwnCloudClient client,
-                          OnRemoteOperationListener listener,
-                          Handler listenerHandler) {
-        return super.execute(client, listener, listenerHandler);
-    }
-
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
deleted file mode 100644
index be773c7f7..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.server
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
-import java.net.URI
-
-/**
- * This object provides all information necessary to interact
- * with backend server.
- */
-data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
-
-    constructor(source: Parcel) : this(
-        source.readSerializable() as URI,
-        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-        writeSerializable(uri)
-        writeParcelable(version, 0)
-    }
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
-            override fun createFromParcel(source: Parcel): Server = Server(source)
-            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
-        }
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
deleted file mode 100644
index b68c4598d..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.user
-
-import android.accounts.Account
-import android.os.Parcelable
-import com.owncloud.android.lib.common.OwnCloudAccount
-import it.niedermann.owncloud.notes.shared.server.Server
-
-interface User : Parcelable, com.nextcloud.common.User {
-    override val accountName: String
-    val server: Server
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy platform Account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return Account instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    override fun toPlatformAccount(): Account
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy ownCloud account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return OwnCloudAccount instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    fun toOwnCloudAccount(): OwnCloudAccount
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(user: User?): Boolean
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(accountName: CharSequence?): Boolean
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
deleted file mode 100644
index cb6c5e14f..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-
-package it.niedermann.owncloud.notes.shared.util
-
-import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.text.TextUtils
-import android.widget.Toast
-import com.owncloud.android.lib.common.utils.Log_OC
-import it.niedermann.owncloud.notes.R
-
-/**
- * Helper implementation to copy a string into the system clipboard.
- */
-object ClipboardUtil {
-    private val TAG = ClipboardUtil::class.java.name
-
-    @JvmStatic
-    @JvmOverloads
-    @Suppress("TooGenericExceptionCaught")
-    fun copyToClipboard(activity: Activity, text: String?, showToast: Boolean = true) {
-        if (!TextUtils.isEmpty(text)) {
-            try {
-                val clip = ClipData.newPlainText(
-                    activity.getString(
-                        R.string.clipboard_label,
-                        activity.getString(R.string.app_name)
-                    ),
-                    text
-                )
-                (activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(clip)
-                if (showToast) {
-                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show()
-                }
-            } catch (e: Exception) {
-                Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show()
-                Log_OC.e(TAG, "Exception caught while copying to clipboard", e)
-            }
-        } else {
-            Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show()
-        }
-    }
-}
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index 8d6e4d150..ffb8e2e6c 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
+        android:contentDescription="@string/note_share_activity_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d238f50a..bde9526c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,36 +38,62 @@
 
     <string name="change_category_title">Choose a category</string>
 
-    <string-array name="folder_share_permission_dialog_values" translatable="false">
+    <!-- UsersAndGroupsSearchProvider -->
+    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+
+    <!-- QuickSharingPermissionsBottomSheetDialog -->
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_folder_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_allow_upload_and_editing</item>
         <item>@string/link_share_file_drop</item>
     </string-array>
-    <string-array name="file_share_permission_dialog_values" translatable="false">
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_note_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_editing</item>
     </string-array>
-    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
-    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
-    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
-    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
-    <string name="note_share_fragment_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
-    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
-    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
-    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
-    <string name="note_share_fragment_share_link">Share link</string>
-    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
-    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
-    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
-    <string name="contact_no_permission">Contact permission is required.</string>
-    <string name="share_link_empty_password">You must enter a password</string>
-    <string name="hint_password">Password</string>
-    <string name="share_link_optional_password_title">Enter an optional password</string>
-    <string name="common_skip">Skip</string>
-    <string name="common_cancel">Cancel</string>
-    <string name="empty" translatable="false" />
+
+    <!-- NoteShareActivity -->
+    <string name="note_share_activity_activity_icon_content_description">note activity icon</string>
+    <string name="note_share_activity_share_icon_content_description">note share icon</string>
+    <string name="note_share_activity_external_icon_content_description">note share external icon</string>
+    <string name="note_share_activity_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_activity_more_icon_content_description">note share more icon</string>
+    <string name="note_share_activity_icon_content_description">note share icon</string>
+    <string name="note_share_activity_user_icon_content_description">note share user icon</string>
+    <string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_activity_share_note">Share note</string>
+    <string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_activity_share_link">Share link</string>
+    <string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
+
+    <!-- NoteShareDetailActivity -->
+    <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
+    <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
+    <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
+    <string name="note_share_detail_activity_hint_note">Note</string>
+    <string name="note_share_detail_activity_common_next">Next</string>
+    <string name="note_share_detail_activity_share_copy_link">Share and Copy Link</string>
+    <string name="note_share_detail_activity_common_confirm">Confirm</string>
+    <string name="note_share_detail_activity_set_note">Set Note</string>
+    <string name="note_share_detail_activity_send_share">Send Share</string>
+    <string name="note_share_detail_activity_hint_name">Name</string>
+    <string name="note_share_detail_activity_link_name">Link Name</string>
+    <string name="note_share_detail_activity_share_link_empty_password">You must enter a password</string>
+    <string name="note_share_detail_activity_hint_password">Password</string>
+    <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
+    <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
+    <string name="note_share_detail_activity_cancel">Cancel</string>
+    <string name="note_share_detail_activity_create_share_error">Failed to create a share</string>
+
+    <!-- SharePasswordDialogFragment -->
+    <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>
+    <string name="share_password_dialog_fragment_skip">Skip</string>
+
     <string name="share_link_password_title">Enter a password</string>
     <string name="common_ok">OK</string>
     <string name="common_delete">Delete</string>
@@ -76,6 +102,7 @@
     <string name="no_email_app_available">No App available to handle mail address</string>
     <string name="no_actions">No actions for this user</string>
 
+    <string name="failed_the_remove_share">Failed to remove share</string>
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>
     <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
@@ -124,6 +151,9 @@
     <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_room_clarification">%1$s (conversation)</string>
     <string name="share_known_remote_on_clarification">on %1$s</string>
+    <string name="remote">(remote)</string>
+
+    <string name="empty" translatable="false" />
 
     <string name="copy_link">Copy link</string>
     <string name="share">Share</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 07f1c940a..5a692abf7 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,6 +9,7 @@
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="32EE5355A6BC6E42" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
@@ -1197,6 +1198,14 @@
             <sha256 value="604b5e65496d8c88d5e6767e82db42dc79b74874b2ae426e4cab624867f101f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.8.6">
+         <artifact name="fragment-1.8.6.aar">
+            <sha256 value="6d5aa4c135247a7f8b59ef5d0bb2990f3a8d6502f02c763c8d34df8a410a3731" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fragment-1.8.6.module">
+            <sha256 value="567576bcb6db841f36358f1646e167360b8725be05cfe284907b66b4b12bedd5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
          <artifact name="fragment-ktx-1.3.6.module">
             <sha256 value="a775bab4e5ef78605c2b0f8bc9dcd9e2c2dd6b5d5d9320012a69a5d01375059a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1210,6 +1219,14 @@
             <sha256 value="a15daf4272633025aed5c2e96073c5e904a147802c669db343237cb3b02ba9b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment-ktx" version="1.8.6">
+         <artifact name="fragment-ktx-1.8.6.aar">
+            <sha256 value="64fad5c91c5f3c59509a458e91045ae1277df29bf32c8dc19d0720b5bab405c2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="fragment-ktx-1.8.6.module">
+            <sha256 value="6f9027367f4a598903feba9c7c0652c9863ca763c39467615353db78eb184c91" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="androidx.graphics" name="graphics-path" version="1.0.1">
          <artifact name="graphics-path-1.0.1.aar">
             <sha256 value="8ca4032b6d79b351f0b59ad4b580eddbb9423e1652f7c958830687f1eee2ec03" origin="Generated by Gradle"/>

From 9cbae8ad2e7205a23af182812b9a27b61669d8ff Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 27 Jan 2025 12:05:17 +0100
Subject: [PATCH 090/138] add some logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |  13 +-
 .../share/CreateShareViaLinkOperation.java    |  91 +++
 .../notes/share/NoteShareFragment.java        | 647 ++++++++++++++++++
 .../owncloud/notes/share/SyncOperation.java   |  37 +
 .../owncloud/notes/shared/server/Server.kt    |  40 ++
 .../owncloud/notes/shared/user/User.kt        |  56 ++
 .../notes/shared/util/ClipboardUtil.kt        |  50 ++
 app/src/main/res/values/strings.xml           | 128 +---
 gradle/verification-metadata.xml              |  47 +-
 9 files changed, 937 insertions(+), 172 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt

diff --git a/app/build.gradle b/app/build.gradle
index 088e7628a..c18c1a1cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,17 +95,12 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation 'com.google.guava:guava:31.1-android'
-    implementation ('commons-httpclient:commons-httpclient:3.1') {
-        exclude group: 'commons-logging', module: 'commons-logging'
-    }
-
-    implementation("com.github.nextcloud:android-library:2.19.0") {
+    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
+    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
@@ -122,7 +117,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.fragment:fragment:1.8.6'
+    implementation 'androidx.fragment:fragment:1.8.5'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
@@ -139,7 +134,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.11.0'
 
     // Gson
-    implementation 'com.google.code.gson:gson:2.12.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
 
     // ReactiveX
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
new file mode 100644
index 000000000..509fce819
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
@@ -0,0 +1,91 @@
+package it.niedermann.owncloud.notes.share;
+
+import java.util.ArrayList;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+/**
+ * Creates a new public share for a given file
+ */
+public class CreateShareViaLinkOperation extends SyncOperation {
+
+    private final String path;
+    private final String password;
+    private int permissions = OCShare.NO_PERMISSION;
+
+    public CreateShareViaLinkOperation(String path, String password, User user) {
+        super(user);
+
+        this.path = path;
+        this.password = password;
+    }
+
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
+                ShareType.PUBLIC_LINK,
+                "",
+                false,
+                password,
+                permissions);
+        createOp.setGetShareDetails(true);
+        RemoteOperationResult result = createOp.execute(client);
+
+        if (result.isSuccess()) {
+            if (result.getData().size() > 0) {
+                Object item = result.getData().get(0);
+                if (item instanceof OCShare) {
+                    updateData((OCShare) item);
+                } else {
+                    ArrayList<Object> data = result.getData();
+                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+                    result.setData(data);
+                }
+            } else {
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+            }
+        }
+
+        return result;
+    }
+
+    private void updateData(OCShare share) {
+        // Update DB with the response
+        share.setPath(path);
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setFolder(true);
+        } else {
+            share.setFolder(false);
+        }
+
+        // TODO: Save share
+
+        /*
+        getStorageManager().saveShare(share);
+
+        // Update OCFile with data from share: ShareByLink  and publicLink
+        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
+        if (file != null) {
+            file.setSharedViaLink(true);
+            getStorageManager().saveFile(file);
+        }
+         */
+
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
new file mode 100644
index 000000000..5f1004d38
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -0,0 +1,647 @@
+package it.niedermann.owncloud.notes.share;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
+import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
+import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
+import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
+
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
+        DisplayUtils.AvatarGenerationListener,
+        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+
+    private static final String TAG = "NoteShareFragment";
+    private static final String ARG_NOTE = "NOTE";
+    private static final String ARG_ACCOUNT = "ACCOUNT";
+    private static final String ARG_USER = "USER";
+
+    private FragmentNoteShareBinding binding;
+    private Note note;
+    private User user;
+    private Account account;
+
+    private OnEditShareListener onEditShareListener;
+
+    public static NoteShareFragment newInstance(Note note, User user, Account account) {
+        NoteShareFragment fragment = new NoteShareFragment();
+        Bundle args = new Bundle();
+        args.putSerializable(ARG_NOTE, note);
+        args.putSerializable(ARG_ACCOUNT, account);
+        args.putParcelable(ARG_USER, user);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
+            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
+            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
+        } else {
+            Bundle arguments = getArguments();
+            if (arguments != null) {
+                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
+                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
+                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
+            }
+        }
+
+        if (note == null) {
+            throw new IllegalArgumentException("Note cannot be null");
+        }
+
+        if (user == null) {
+            throw new IllegalArgumentException("Account cannot be null");
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        refreshCapabilitiesFromDB();
+        refreshSharesFromDB();
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
+
+        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+                new ArrayList<>(),
+                this,
+                user,
+                note));
+
+        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
+
+        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+
+        setupView();
+
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            onEditShareListener = (OnEditShareListener) context;
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Calling activity must implement the interface", e);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        searchConfig.reset();
+    }
+
+    private void setupView() {
+        setShareWithYou();
+
+        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        FileDetailSharingFragmentHelper.setupSearchView(
+                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
+                binding.searchView,
+                fileActivity.getComponentName());
+        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+
+        if (file.canReshare()) {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        } else {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+            binding.searchView.setInputType(InputType.TYPE_NULL);
+            binding.pickContactEmailBtn.setVisibility(View.GONE);
+            disableSearchView(binding.searchView);
+        }
+    }
+
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    // TODO: Check if note.getAccountId() return note's owner's id
+    private boolean accountOwnsFile() {
+        String noteId = String.valueOf(note.getAccountId());
+        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+    }
+
+    private void setShareWithYou() {
+        if (accountOwnsFile()) {
+            binding.sharedWithYouContainer.setVisibility(View.GONE);
+        } else {
+
+            /*
+            // TODO: How to get owner display name from note?
+
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
+
+
+            Glide.with(this)
+                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                    .error(R.drawable.ic_account_circle_grey_24dp)
+                    .apply(RequestOptions.circleCropTransform())
+                    .into(binding.sharedWithYouAvatar);
+
+            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+
+            /*
+            // TODO: Note's note?
+            String note = file.getNote();
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(file.getNote());
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
+             */
+        }
+    }
+
+    private void copyInternalLink() {
+        if (account == null) {
+            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.sharesList)
+                    .show();
+            return;
+        }
+
+        showShareLinkDialog();
+    }
+
+    private void showShareLinkDialog() {
+        String link = createInternalLink();
+
+        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+
+        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+        intentToShareLink.setType("text/plain");
+        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
+
+        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
+        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
+    }
+
+    // TODO: Check account.getUrl returning base url?
+    private String createInternalLink() {
+        Uri baseUri = Uri.parse(account.getUrl());
+        return baseUri + "/index.php/f/" +  note.getId();
+    }
+
+    // TODO: Capabilities in notes app doesn't have following functions...
+    public void createPublicShareLink() {
+        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
+            // Is CreateShareViaLink operation compatible?
+
+            Intent service = new Intent(fileActivity, OperationsService.class);
+            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
+            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
+            if (!TextUtils.isEmpty(password)) {
+                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
+            }
+            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
+        }
+    }
+
+    private void createSecureFileDrop() {
+        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    }
+
+    /*
+    // TODO: Cant call getFileWithLink
+
+     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
+        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
+                                                                                       ShareType.PUBLIC_LINK,
+                                                                                       "");
+
+        if (shares.size() == SINGLE_LINK_SIZE) {
+            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
+        } else {
+            if (fileActivity instanceof FileDisplayActivity) {
+                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
+            } else {
+                showShareFile(file);
+            }
+        }
+
+        fileActivity.refreshList();
+    }
+     */
+    private void showSendLinkTo(OCShare publicShare) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(publicShare.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                // TODO: get link from public share and pass to the function
+                showShareLinkDialog();
+            }
+        }
+    }
+
+    public void copyLink(OCShare share) {
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(share.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+            }
+        }
+    }
+
+    /**
+     * show share action bottom sheet
+     *
+     * @param share
+     */
+    @Override
+    @VisibleForTesting
+    public void showSharingMenuActionSheet(OCShare share) {
+        if (fileActivity != null && !fileActivity.isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        }
+    }
+
+    /**
+     * show quick sharing permission dialog
+     *
+     * @param share
+     */
+    @Override
+    public void showPermissionsDialog(OCShare share) {
+        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @param file   the edited {@link OCFile}
+     * @see #onUpdateShareInformation(RemoteOperationResult)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
+        this.file = file;
+
+        onUpdateShareInformation(result);
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
+     * OCFile held by this fragment}.
+     *
+     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
+     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
+     */
+    public void onUpdateShareInformation(RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            refreshUiFromDB();
+        } else {
+            setupView();
+        }
+    }
+
+    /**
+     * Get {@link OCShare} instance from DB and updates the UI.
+     */
+    private void refreshUiFromDB() {
+        refreshSharesFromDB();
+        // Updates UI with new state
+        setupView();
+    }
+
+    private void unshareWith(OCShare share) {
+        fileOperationsHelper.unshareShare(file, share);
+    }
+
+    /**
+     * Starts a dialog that requests a password to the user to protect a share link.
+     *
+     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
+     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
+     * @param askForPassword if true, password is optional
+     */
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+                createShare,
+                askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void requestPasswordForShare(OCShare share, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
+        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void showProfileBottomSheet(User user, String shareWith) {
+        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
+            new RetrieveHoverCardAsyncTask(user,
+                    shareWith,
+                    fileActivity,
+                    clientFactory,
+                    viewThemeUtils).execute();
+        }
+    }
+
+    /**
+     * Get known server capabilities from DB
+     */
+    public void refreshCapabilitiesFromDB() {
+        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+    }
+
+    /**
+     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
+     * before reading database.
+     */
+    public void refreshSharesFromDB() {
+        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
+        if (newFile != null) {
+            file = newFile;
+        }
+
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            return;
+        }
+        adapter.getShares().clear();
+
+        // to show share with users/groups info
+        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
+                user.getAccountName());
+
+        adapter.addShares(shares);
+
+        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
+            return;
+        }
+
+        // Get public share
+        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
+                ShareType.PUBLIC_LINK,
+                "");
+
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
+                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+            final OCShare ocShare = new OCShare();
+            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+            publicShares.add(ocShare);
+        } else {
+            adapter.removeNewPublicShare();
+        }
+
+        adapter.addShares(publicShares);
+    }
+
+    private void checkContactPermission() {
+        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+            pickContactEmail();
+        } else {
+            requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
+        }
+    }
+
+    private void pickContactEmail() {
+        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
+
+        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
+            onContactSelectionResultLauncher.launch(intent);
+        } else {
+            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+        }
+    }
+
+    private void handleContactResult(@NonNull Uri contactUri) {
+        // Define the projection to get all email addresses.
+        String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
+
+        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                // The contact has only one email address, use it.
+                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
+                if (columnIndex != -1) {
+                    // Use the email address as needed.
+                    // email variable contains the selected contact's email address.
+                    String email = cursor.getString(columnIndex);
+                    binding.searchView.post(() -> {
+                        binding.searchView.setQuery(email, false);
+                        binding.searchView.requestFocus();
+                    });
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
+                }
+            } else {
+                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
+            }
+            cursor.close();
+        } else {
+            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
+        }
+    }
+
+    private boolean containsNoNewPublicShare(List<OCShare> shares) {
+        for (OCShare share : shares) {
+            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        FileExtensionsKt.logFileSize(file, TAG);
+        outState.putParcelable(ARG_NOTE, file);
+        outState.putParcelable(ARG_USER, user);
+    }
+
+    @Override
+    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
+        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
+    }
+
+    @Override
+    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
+        return false;
+    }
+
+    private boolean isReshareForbidden(OCShare share) {
+        return ShareType.FEDERATED == share.getShareType() ||
+                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+    }
+
+    @VisibleForTesting
+    public void search(String query) {
+        SearchView searchView = requireView().findViewById(R.id.searchView);
+        searchView.setQuery(query, true);
+    }
+
+    @Override
+    public void advancedPermissions(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+    }
+
+
+    @Override
+    public void sendNewEmail(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+    }
+
+    @Override
+    public void unShare(OCShare share) {
+        unshareWith(share);
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            return;
+        }
+        adapter.remove(share);
+    }
+
+    @Override
+    public void sendLink(OCShare share) {
+        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
+            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
+        } else {
+            showSendLinkTo(share);
+        }
+    }
+
+    @Override
+    public void addAnotherLink(OCShare share) {
+        createPublicShareLink();
+    }
+
+    private void modifyExistingShare(OCShare share, int screenTypePermission) {
+        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
+                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+    }
+
+    @Override
+    public void onQuickPermissionChanged(OCShare share, int permission) {
+        fileOperationsHelper.setPermissionsToShare(share, permission);
+    }
+
+    //launcher for contact permission
+    private final ActivityResultLauncher<String> requestContactPermissionLauncher =
+            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+                if (isGranted) {
+                    pickContactEmail();
+                } else {
+                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                }
+            });
+
+    //launcher to handle contact selection
+    private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
+            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                    result -> {
+                        if (result.getResultCode() == Activity.RESULT_OK) {
+                            Intent intent = result.getData();
+                            if (intent == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            Uri contactUri = intent.getData();
+                            if (contactUri == null) {
+                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                return;
+                            }
+
+                            handleContactResult(contactUri);
+
+                        }
+                    });
+
+    public interface OnEditShareListener {
+        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
+                               boolean isExpiryDateShown);
+
+        void onShareProcessClosed();
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
new file mode 100644
index 000000000..62eb8661a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
@@ -0,0 +1,37 @@
+package it.niedermann.owncloud.notes.share;
+
+
+import android.content.Context;
+import android.os.Handler;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.User;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
+import androidx.annotation.NonNull;
+
+public abstract class SyncOperation extends RemoteOperation {
+    private final User user;
+
+    public SyncOperation(@NonNull User user) {
+        this.user = user;
+    }
+
+    public RemoteOperationResult execute(Context context) {
+        return super.execute(user, context);
+    }
+
+    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
+        return run(client);
+    }
+
+    public Thread execute(OwnCloudClient client,
+                          OnRemoteOperationListener listener,
+                          Handler listenerHandler) {
+        return super.execute(client, listener, listenerHandler);
+    }
+
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
new file mode 100644
index 000000000..be773c7f7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
@@ -0,0 +1,40 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.server
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import java.net.URI
+
+/**
+ * This object provides all information necessary to interact
+ * with backend server.
+ */
+data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
+
+    constructor(source: Parcel) : this(
+        source.readSerializable() as URI,
+        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
+        writeSerializable(uri)
+        writeParcelable(version, 0)
+    }
+
+    companion object {
+        @JvmField
+        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
+            override fun createFromParcel(source: Parcel): Server = Server(source)
+            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
new file mode 100644
index 000000000..b68c4598d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
@@ -0,0 +1,56 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.user
+
+import android.accounts.Account
+import android.os.Parcelable
+import com.owncloud.android.lib.common.OwnCloudAccount
+import it.niedermann.owncloud.notes.shared.server.Server
+
+interface User : Parcelable, com.nextcloud.common.User {
+    override val accountName: String
+    val server: Server
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy platform Account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return Account instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    override fun toPlatformAccount(): Account
+
+    /**
+     * This is temporary helper method created to facilitate incremental refactoring.
+     * Code using legacy ownCloud account can be partially converted to instantiate User
+     * object and use account instance when required.
+     *
+     * This method calls will allow tracing code awaiting further refactoring.
+     *
+     * @return OwnCloudAccount instance that is associated with this User object.
+     */
+    @Deprecated("Temporary workaround")
+    fun toOwnCloudAccount(): OwnCloudAccount
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(user: User?): Boolean
+
+    /**
+     * Compare account names, case insensitive.
+     *
+     * @return true if account names are same, false otherwise
+     */
+    fun nameEquals(accountName: CharSequence?): Boolean
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
new file mode 100644
index 000000000..cb6c5e14f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
@@ -0,0 +1,50 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.shared.util
+
+import android.app.Activity
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.text.TextUtils
+import android.widget.Toast
+import com.owncloud.android.lib.common.utils.Log_OC
+import it.niedermann.owncloud.notes.R
+
+/**
+ * Helper implementation to copy a string into the system clipboard.
+ */
+object ClipboardUtil {
+    private val TAG = ClipboardUtil::class.java.name
+
+    @JvmStatic
+    @JvmOverloads
+    @Suppress("TooGenericExceptionCaught")
+    fun copyToClipboard(activity: Activity, text: String?, showToast: Boolean = true) {
+        if (!TextUtils.isEmpty(text)) {
+            try {
+                val clip = ClipData.newPlainText(
+                    activity.getString(
+                        R.string.clipboard_label,
+                        activity.getString(R.string.app_name)
+                    ),
+                    text
+                )
+                (activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(clip)
+                if (showToast) {
+                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show()
+                }
+            } catch (e: Exception) {
+                Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show()
+                Log_OC.e(TAG, "Exception caught while copying to clipboard", e)
+            }
+        } else {
+            Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show()
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bde9526c0..06af4e559 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,125 +38,19 @@
 
     <string name="change_category_title">Choose a category</string>
 
-    <!-- UsersAndGroupsSearchProvider -->
-    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
-
-    <!-- QuickSharingPermissionsBottomSheetDialog -->
-    <string-array name="quick_sharing_permission_bottom_sheet_dialog_folder_share_values" translatable="false">
-        <item>@string/link_share_view_only</item>
-        <item>@string/link_share_allow_upload_and_editing</item>
-        <item>@string/link_share_file_drop</item>
-    </string-array>
-    <string-array name="quick_sharing_permission_bottom_sheet_dialog_note_share_values" translatable="false">
-        <item>@string/link_share_view_only</item>
-        <item>@string/link_share_editing</item>
-    </string-array>
-
-    <!-- NoteShareActivity -->
-    <string name="note_share_activity_activity_icon_content_description">note activity icon</string>
-    <string name="note_share_activity_share_icon_content_description">note share icon</string>
-    <string name="note_share_activity_external_icon_content_description">note share external icon</string>
-    <string name="note_share_activity_copy_icon_content_description">note share copy icon</string>
-    <string name="note_share_activity_more_icon_content_description">note share more icon</string>
-    <string name="note_share_activity_icon_content_description">note share icon</string>
-    <string name="note_share_activity_user_icon_content_description">note share user icon</string>
-    <string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
-    <string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
-    <string name="note_share_activity_share_note">Share note</string>
-    <string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
-    <string name="note_share_activity_share_link">Share link</string>
-    <string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>
-    <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
-    <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
-    <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
-
-    <!-- NoteShareDetailActivity -->
-    <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
-    <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
-    <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
-    <string name="note_share_detail_activity_hint_note">Note</string>
-    <string name="note_share_detail_activity_common_next">Next</string>
-    <string name="note_share_detail_activity_share_copy_link">Share and Copy Link</string>
-    <string name="note_share_detail_activity_common_confirm">Confirm</string>
-    <string name="note_share_detail_activity_set_note">Set Note</string>
-    <string name="note_share_detail_activity_send_share">Send Share</string>
-    <string name="note_share_detail_activity_hint_name">Name</string>
-    <string name="note_share_detail_activity_link_name">Link Name</string>
-    <string name="note_share_detail_activity_share_link_empty_password">You must enter a password</string>
-    <string name="note_share_detail_activity_hint_password">Password</string>
-    <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
-    <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
-    <string name="note_share_detail_activity_cancel">Cancel</string>
-    <string name="note_share_detail_activity_create_share_error">Failed to create a share</string>
-
-    <!-- SharePasswordDialogFragment -->
-    <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>
-    <string name="share_password_dialog_fragment_skip">Skip</string>
-
-    <string name="share_link_password_title">Enter a password</string>
-    <string name="common_ok">OK</string>
-    <string name="common_delete">Delete</string>
-    <string name="write_email">Send email</string>
-    <string name="no_browser_available">No app available to handle links</string>
-    <string name="no_email_app_available">No App available to handle mail address</string>
-    <string name="no_actions">No actions for this user</string>
-
-    <string name="failed_the_remove_share">Failed to remove share</string>
-    <string name="email_pick_failed">Failed to pick email address.</string>
-    <string name="failed_update_ui">Failed to update UI</string>
-    <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
-    <string name="activity_chooser_title">Send link to…</string>
-
-    <string name="activity_chooser_send_file_title">Send</string>
-    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
-    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
-    <string name="share_internal_link">Share internal link</string>
-    <string name="delete_link">Delete Link</string>
-    <string name="share_settings">Settings</string>
-    <string name="share_send_new_email">Send new email</string>
-    <string name="share_dialog_title">Sharing</string>
-    <string name="share_file">Share %1$s</string>
-    <string name="share_expiration_date_label">Expires %1$s</string>
-    <string name="share_expiration_date_format">%1$s</string>
-    <string name="share_no_expiration_date_label">Set expiration date</string>
-    <string name="share_via_link_section_title">Share link</string>
-    <string name="share_via_link_send_link_label">Send link</string>
-    <string name="share_password_title">Password-protected</string>
-    <string name="share_no_password_title">Set password</string>
-    <string name="share_with_title">Share with…</string>
-    <string name="share_via_link_unset_password">Unset</string>
-    <string name="add_another_public_share_link">Add another link</string>
-    <string name="add_new_public_share">Add new public share link</string>
-    <string name="public_share_name">New name</string>
-    <string name="share_link_with_label">Share link (%1$s)</string>
-    <string name="share_link">Share link</string>
-    <string name="allow_resharing">Allow resharing</string>
-    <string name="link_share_view_only">View only</string>
-    <string name="link_share_editing">Editing</string>
-    <string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
-    <string name="link_share_file_drop">File drop (upload only)</string>
-    <string name="could_not_retrieve_shares">Could not retrieve shares</string>
-    <string name="share_permission_view_only">View only</string>
-    <string name="share_permission_can_edit">Can edit</string>
-    <string name="share_permission_file_drop">File drop</string>
-    <string name="share_permission_secure_file_drop">Secure file drop</string>
-    <string name="share_permissions">Share Permissions</string>
-    <plurals name="share_download_limit_description">
-        <item quantity="one">%1$d download remaining</item>
-        <item quantity="other">%1$d downloads remaining</item>
-    </plurals>
-    <string name="username">Username</string>
-    <string name="share_group_clarification">%1$s (group)</string>
-    <string name="share_remote_clarification">%1$s (remote)</string>
-    <string name="share_room_clarification">%1$s (conversation)</string>
-    <string name="share_known_remote_on_clarification">on %1$s</string>
-    <string name="remote">(remote)</string>
-
-    <string name="empty" translatable="false" />
+    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
+    <string name="note_share_fragment_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
+    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_fragment_share_link">Share link</string>
+    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
 
     <string name="copy_link">Copy link</string>
-    <string name="share">Share</string>
     <string name="clipboard_text_copied">Link copied</string>
     <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>
     <string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5a692abf7..3b295593a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,7 +9,6 @@
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="32EE5355A6BC6E42" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
@@ -36,10 +35,7 @@
          </trusted-key>
          <trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E" group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.5.2"/>
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
-         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638">
-            <trusting group="org.checkerframework" name="checker-compat-qual" version="2.5.5"/>
-            <trusting group="org.checkerframework" name="checker-qual"/>
-         </trusted-key>
+         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
          <trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
          <trusted-key id="1D9AA7F9E1E2824728B8CD1794B291AEF984A085" group="io.reactivex.rxjava2"/>
          <trusted-key id="24D04176586361FDA94EE0315F7786DF73E61F56" group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.0-1.0.13"/>
@@ -111,7 +107,6 @@
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
             <trusting group="androidx.tracing" name="tracing" version="1.2.0"/>
-            <trusting group="androidx.tracing" name="tracing-ktx" version="1.2.0"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -135,18 +130,15 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.collection"/>
-            <trusting group="androidx.concurrent"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.graphics"/>
             <trusting group="androidx.lifecycle"/>
-            <trusting group="androidx.recyclerview" name="recyclerview" version="1.4.0"/>
             <trusting group="androidx.test"/>
             <trusting group="androidx.test.espresso" name="espresso-idling-resource" version="3.6.1"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
-            <trusting group="androidx.work" name="work-runtime" version="2.10.0"/>
             <trusting group="androidx.work" name="work-runtime" version="2.9.1"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
@@ -1198,14 +1190,6 @@
             <sha256 value="604b5e65496d8c88d5e6767e82db42dc79b74874b2ae426e4cab624867f101f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment" version="1.8.6">
-         <artifact name="fragment-1.8.6.aar">
-            <sha256 value="6d5aa4c135247a7f8b59ef5d0bb2990f3a8d6502f02c763c8d34df8a410a3731" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="fragment-1.8.6.module">
-            <sha256 value="567576bcb6db841f36358f1646e167360b8725be05cfe284907b66b4b12bedd5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
          <artifact name="fragment-ktx-1.3.6.module">
             <sha256 value="a775bab4e5ef78605c2b0f8bc9dcd9e2c2dd6b5d5d9320012a69a5d01375059a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1219,14 +1203,6 @@
             <sha256 value="a15daf4272633025aed5c2e96073c5e904a147802c669db343237cb3b02ba9b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment-ktx" version="1.8.6">
-         <artifact name="fragment-ktx-1.8.6.aar">
-            <sha256 value="64fad5c91c5f3c59509a458e91045ae1277df29bf32c8dc19d0720b5bab405c2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="fragment-ktx-1.8.6.module">
-            <sha256 value="6f9027367f4a598903feba9c7c0652c9863ca763c39467615353db78eb184c91" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
       <component group="androidx.graphics" name="graphics-path" version="1.0.1">
          <artifact name="graphics-path-1.0.1.aar">
             <sha256 value="8ca4032b6d79b351f0b59ad4b580eddbb9423e1652f7c958830687f1eee2ec03" origin="Generated by Gradle"/>
@@ -1545,11 +1521,6 @@
             <sha256 value="179fc4d2d022c0a8247e7612feab40b951bd8710f6b452e3ed6dc03a1e52769d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.recyclerview" name="recyclerview" version="1.4.0">
-         <artifact name="recyclerview-1.4.0.aar">
-            <sha256 value="0f32ccaffcda74c3f87f0b4cfe6ae78e8aa4eb3ad7dda4f2edf06eedc947a5cf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.recyclerview" name="recyclerview-selection" version="1.1.0">
          <artifact name="recyclerview-selection-1.1.0.aar">
             <sha256 value="9e2ba1c7d6b0eb5e64c10b1b0eb01b51e8511cee002c9bd56ce9cc138ebc4898" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5069,14 +5040,6 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
-         <artifact name="android-library-2.19.0.aar">
-            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="android-library-2.19.0.module">
-            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.nextcloud" name="android-library" version="3d422b28376339c0fbd772e480dbbdc56b7ae1a1">
          <artifact name="android-library-3d422b28376339c0fbd772e480dbbdc56b7ae1a1.aar">
             <sha256 value="58debdb6fecf8f254f38bed011ea4849405017679c7978755e2a004031b3f69e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6426,14 +6389,6 @@
             <sha256 value="5777d292251c7895c04a4c57015683ec3b353a12486c9b3e7178e9b0b3c38fff" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="commons-logging" name="commons-logging" version="1.0.4">
-         <artifact name="commons-logging-1.0.4.jar">
-            <sha256 value="e94af49749384c11f5aa50e8d0f5fe679be771295b52030338d32843c980351e" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="commons-logging-1.0.4.pom">
-            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.jar">
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>

From 0d00294d164e17d41ddabd7e2e4094ac2de4cd57 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 28 Jan 2025 10:06:51 +0100
Subject: [PATCH 091/138] first successfull build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/build.gradle                              |   9 +-
 .../notes/share/ClientFactoryImpl.java        |  84 +++++++
 .../notes/share/NoteShareFragment.java        | 209 +++++++++++-------
 app/src/main/res/layout/activity_row.xml      |   2 +-
 app/src/main/res/values/strings.xml           |  75 +++++++
 gradle/verification-metadata.xml              |  30 ++-
 6 files changed, 323 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java

diff --git a/app/build.gradle b/app/build.gradle
index c18c1a1cb..513be6a83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,12 +95,17 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-    implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") {
+    implementation 'com.google.guava:guava:31.1-android'
+    implementation ('commons-httpclient:commons-httpclient:3.1') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+
+    implementation("com.github.nextcloud:android-library:2.19.0") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.24.0'
+    implementation 'com.github.nextcloud.android-common:ui:0.23.2'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
     implementation 'com.github.stefan-niedermann:android-commons:1.0.2'
     implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
new file mode 100644
index 000000000..b9c82d25e
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+
+package it.niedermann.owncloud.notes.share.operations;
+
+import android.accounts.Account;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.common.PlainClient;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+
+import java.io.IOException;
+
+import it.niedermann.owncloud.notes.shared.user.User;
+
+public class ClientFactoryImpl implements ClientFactory {
+
+    private Context context;
+
+    public ClientFactoryImpl(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public OwnCloudClient create(User user) throws CreationException {
+        try {
+            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
+        } catch (OperationCanceledException |
+            AuthenticatorException |
+            IOException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public NextcloudClient createNextcloudClient(User user) throws CreationException {
+        try {
+            return OwnCloudClientFactory.createNextcloudClient(user, context);
+        } catch (AccountUtils.AccountNotFoundException e) {
+            throw new CreationException(e);
+        }
+    }
+
+    @Override
+    public OwnCloudClient create(Account account)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context);
+    }
+
+    @Override
+    public OwnCloudClient create(Account account, Activity currentActivity)
+        throws OperationCanceledException, AuthenticatorException, IOException,
+        AccountUtils.AccountNotFoundException {
+        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public OwnCloudClient create(Uri uri, boolean followRedirects) {
+        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
+    }
+
+    @Override
+    public PlainClient createPlainClient() {
+        return new PlainClient(context);
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
index 5f1004d38..759c8a8f0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
@@ -3,8 +3,10 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.SearchManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -15,6 +17,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -22,6 +25,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -29,6 +33,11 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,18 +48,26 @@
 import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
+import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
+import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
+import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener,
-        DisplayUtils.AvatarGenerationListener,
-        Injectable, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareFragment";
     private static final String ARG_NOTE = "NOTE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
     private static final String ARG_USER = "USER";
+    public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
     private FragmentNoteShareBinding binding;
     private Note note;
@@ -58,6 +75,7 @@ public class NoteShareFragment extends Fragment implements ShareeListAdapterList
     private Account account;
 
     private OnEditShareListener onEditShareListener;
+    private ClientFactoryImpl clientFactory;
 
     public static NoteShareFragment newInstance(Note note, User user, Account account) {
         NoteShareFragment fragment = new NoteShareFragment();
@@ -73,6 +91,8 @@ public static NoteShareFragment newInstance(Note note, User user, Account accoun
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        clientFactory = new ClientFactoryImpl(requireContext());
+
         if (savedInstanceState != null) {
             note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
             account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
@@ -107,11 +127,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         binding = FragmentNoteShareBinding.inflate(inflater, container, false);
 
-        binding.sharesList.setAdapter(new ShareeListAdapter(fileActivity,
+        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
                 new ArrayList<>(),
                 this,
                 user,
-                note));
+                account));
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
 
@@ -141,26 +161,29 @@ public void onAttach(@NonNull Context context) {
     @Override
     public void onStart() {
         super.onStart();
-        searchConfig.setSearchOnlyUsers(file.isEncrypted());
+        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
     }
 
     @Override
     public void onStop() {
         super.onStop();
-        searchConfig.reset();
+        UsersAndGroupsSearchConfig.INSTANCE.reset();
     }
 
     private void setupView() {
         setShareWithYou();
 
-        OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
+        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
-        FileDetailSharingFragmentHelper.setupSearchView(
-                (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
-                binding.searchView,
-                fileActivity.getComponentName());
-        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
+        binding.pickContactEmailBtn.setVisibility(View.GONE);
+        disableSearchView(binding.searchView);
 
+        /*
         if (file.canReshare()) {
             binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
         } else {
@@ -169,6 +192,39 @@ private void setupView() {
             binding.pickContactEmailBtn.setVisibility(View.GONE);
             disableSearchView(binding.searchView);
         }
+         */
+
+    }
+
+    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
+                                       ComponentName componentName) {
+        if (searchManager == null) {
+            searchView.setVisibility(View.GONE);
+            return;
+        }
+
+        // assumes parent activity is the searchable activity
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
+
+        // do not iconify the widget; expand it by default
+        searchView.setIconifiedByDefault(false);
+
+        // avoid fullscreen with softkeyboard
+        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                // return true to prevent the query from being processed;
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                // leave it for the parent listener in the hierarchy / default behaviour
+                return false;
+            }
+        });
     }
 
     private void disableSearchView(View view) {
@@ -223,7 +279,7 @@ private void setShareWithYou() {
         }
     }
 
-    private void copyInternalLink() {
+    public void copyInternalLink() {
         if (account == null) {
             BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
                     .setAnchorView(binding.sharesList)
@@ -245,7 +301,7 @@ private void showShareLinkDialog() {
 
         String[] packagesToExclude = new String[] { requireContext().getPackageName() };
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FileDisplayActivity.FTAG_CHOOSER_DIALOG);
+        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
     // TODO: Check account.getUrl returning base url?
@@ -256,6 +312,7 @@ private String createInternalLink() {
 
     // TODO: Capabilities in notes app doesn't have following functions...
     public void createPublicShareLink() {
+        /*
         if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
                 capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
             // password enforced by server, request to the user before trying to create
@@ -275,10 +332,12 @@ public void createPublicShareLink() {
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
+         */
+
     }
 
-    private void createSecureFileDrop() {
-        fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    public void createSecureFileDrop() {
+        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
     }
 
     /*
@@ -303,6 +362,7 @@ public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewTheme
     }
      */
     private void showSendLinkTo(OCShare publicShare) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(publicShare.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -311,9 +371,12 @@ private void showSendLinkTo(OCShare publicShare) {
                 showShareLinkDialog();
             }
         }
+         */
+
     }
 
     public void copyLink(OCShare share) {
+        /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(share.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
@@ -321,51 +384,22 @@ public void copyLink(OCShare share) {
                 ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
             }
         }
+         */
+
     }
 
-    /**
-     * show share action bottom sheet
-     *
-     * @param share
-     */
     @Override
-    @VisibleForTesting
     public void showSharingMenuActionSheet(OCShare share) {
-        if (fileActivity != null && !fileActivity.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        if (getActivity() != null && !getActivity().isFinishing()) {
+            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
         }
     }
 
-    /**
-     * show quick sharing permission dialog
-     *
-     * @param share
-     */
     @Override
     public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(fileActivity, this, share, viewThemeUtils).show();
+        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
     }
 
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @param file   the edited {@link OCFile}
-     * @see #onUpdateShareInformation(RemoteOperationResult)
-     */
-    public void onUpdateShareInformation(RemoteOperationResult result, OCFile file) {
-        this.file = file;
-
-        onUpdateShareInformation(result);
-    }
-
-    /**
-     * Updates the UI after the result of an update operation on the edited {@link OCFile}. Keeps the current {@link
-     * OCFile held by this fragment}.
-     *
-     * @param result {@link RemoteOperationResult} of an update on the edited {@link OCFile} sharing information.
-     * @see #onUpdateShareInformation(RemoteOperationResult, OCFile)
-     */
     public void onUpdateShareInformation(RemoteOperationResult result) {
         if (result.isSuccess()) {
             refreshUiFromDB();
@@ -384,7 +418,7 @@ private void refreshUiFromDB() {
     }
 
     private void unshareWith(OCShare share) {
-        fileOperationsHelper.unshareShare(file, share);
+        // fileOperationsHelper.unshareShare(file, share);
     }
 
     /**
@@ -395,7 +429,7 @@ private void unshareWith(OCShare share) {
      * @param askForPassword if true, password is optional
      */
     public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(file,
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
                 createShare,
                 askForPassword);
         dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
@@ -411,10 +445,10 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     public void showProfileBottomSheet(User user, String shareWith) {
         if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
             new RetrieveHoverCardAsyncTask(user,
+                    account,
                     shareWith,
-                    fileActivity,
-                    clientFactory,
-                    viewThemeUtils).execute();
+                    getActivity(),
+                    clientFactory).execute();
         }
     }
 
@@ -422,7 +456,7 @@ public void showProfileBottomSheet(User user, String shareWith) {
      * Get known server capabilities from DB
      */
     public void refreshCapabilitiesFromDB() {
-        capabilities = fileDataStorageManager.getCapability(user.getAccountName());
+        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
     /**
@@ -430,6 +464,7 @@ public void refreshCapabilitiesFromDB() {
      * before reading database.
      */
     public void refreshSharesFromDB() {
+        /*
         OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
         if (newFile != null) {
             file = newFile;
@@ -438,7 +473,8 @@ public void refreshSharesFromDB() {
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
+            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.getShares().clear();
@@ -458,8 +494,7 @@ public void refreshSharesFromDB() {
                 ShareType.PUBLIC_LINK,
                 "");
 
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
-                (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
             final OCShare ocShare = new OCShare();
             ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
             publicShares.add(ocShare);
@@ -468,10 +503,12 @@ public void refreshSharesFromDB() {
         }
 
         adapter.addShares(publicShares);
+         */
+
     }
 
     private void checkContactPermission() {
-        if (PermissionUtil.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS)) {
+        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
             pickContactEmail();
         } else {
             requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
@@ -484,7 +521,8 @@ private void pickContactEmail() {
         if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
             onContactSelectionResultLauncher.launch(intent);
         } else {
-            DisplayUtils.showSnackMessage(requireActivity(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message));
+            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
+                    .show();
         }
     }
 
@@ -492,7 +530,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
         // Define the projection to get all email addresses.
         String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
 
-        Cursor cursor = fileActivity.getContentResolver().query(contactUri, projection, null, null, null);
+        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
 
         if (cursor != null) {
             if (cursor.moveToFirst()) {
@@ -507,16 +545,19 @@ private void handleContactResult(@NonNull Uri contactUri) {
                         binding.searchView.requestFocus();
                     });
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                            .show();
                     Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
                 }
             } else {
-                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                        .show();
                 Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
             }
             cursor.close();
         } else {
-            DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
         }
     }
@@ -534,24 +575,22 @@ private boolean containsNoNewPublicShare(List<OCShare> shares) {
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        FileExtensionsKt.logFileSize(file, TAG);
-        outState.putParcelable(ARG_NOTE, file);
+        outState.putSerializable(ARG_NOTE, note);
+        outState.putSerializable(ARG_ACCOUNT, account);
         outState.putParcelable(ARG_USER, user);
     }
 
-    @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
     }
 
-    @Override
     public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
         return false;
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return ShareType.FEDERATED == share.getShareType() ||
-                capabilities != null && capabilities.getFilesSharingResharing().isFalse();
+        return false;
+        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -562,13 +601,13 @@ public void search(String query) {
 
     @Override
     public void advancedPermissions(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
     }
 
 
     @Override
     public void sendNewEmail(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
+        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
     }
 
     @Override
@@ -576,7 +615,8 @@ public void unShare(OCShare share) {
         unshareWith(share);
         ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
         if (adapter == null) {
-            DisplayUtils.showSnackMessage(getView(), getString(R.string.failed_update_ui));
+            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                    .show();
             return;
         }
         adapter.remove(share);
@@ -584,11 +624,14 @@ public void unShare(OCShare share) {
 
     @Override
     public void sendLink(OCShare share) {
+        /*
         if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
             FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
         } else {
             showSendLinkTo(share);
         }
+         */
+
     }
 
     @Override
@@ -597,13 +640,12 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
-                capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
     }
 
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
-        fileOperationsHelper.setPermissionsToShare(share, permission);
+       // fileOperationsHelper.setPermissionsToShare(share, permission);
     }
 
     //launcher for contact permission
@@ -612,7 +654,8 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 if (isGranted) {
                     pickContactEmail();
                 } else {
-                    DisplayUtils.showSnackMessage(binding.getRoot(), R.string.contact_no_permission);
+                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
+                            .show();
                 }
             });
 
@@ -623,13 +666,15 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                         if (result.getResultCode() == Activity.RESULT_OK) {
                             Intent intent = result.getData();
                             if (intent == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
                             Uri contactUri = intent.getData();
                             if (contactUri == null) {
-                                DisplayUtils.showSnackMessage(binding.getRoot(), R.string.email_pick_failed);
+                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
+                                        .show();
                                 return;
                             }
 
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index ffb8e2e6c..8d6e4d150 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/note_share_activity_activity_icon_content_description" />
+        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06af4e559..944bfa5c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,18 @@
 
     <string name="change_category_title">Choose a category</string>
 
+    <string-array name="folder_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_allow_upload_and_editing</item>
+        <item>@string/link_share_file_drop</item>
+    </string-array>
+    <string-array name="file_share_permission_dialog_values" translatable="false">
+        <item>@string/link_share_view_only</item>
+        <item>@string/link_share_editing</item>
+    </string-array>
+    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
+    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
+    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
     <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
     <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
     <string name="note_share_fragment_icon_content_description">note share icon</string>
@@ -49,6 +61,69 @@
     <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
     <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
     <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="contact_no_permission">Contact permission is required.</string>
+    <string name="share_link_empty_password">You must enter a password</string>
+    <string name="hint_password">Password</string>
+    <string name="share_link_optional_password_title">Enter an optional password</string>
+    <string name="common_skip">Skip</string>
+    <string name="common_cancel">Cancel</string>
+    <string name="empty" translatable="false" />
+    <string name="share_link_password_title">Enter a password</string>
+    <string name="common_ok">OK</string>
+    <string name="common_delete">Delete</string>
+    <string name="write_email">Send email</string>
+    <string name="no_browser_available">No app available to handle links</string>
+    <string name="no_email_app_available">No App available to handle mail address</string>
+    <string name="no_actions">No actions for this user</string>
+
+    <string name="email_pick_failed">Failed to pick email address.</string>
+    <string name="failed_update_ui">Failed to update UI</string>
+    <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
+    <string name="activity_chooser_title">Send link to…</string>
+
+    <string name="activity_chooser_send_file_title">Send</string>
+    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
+    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
+    <string name="share_internal_link">Share internal link</string>
+    <string name="delete_link">Delete Link</string>
+    <string name="share_settings">Settings</string>
+    <string name="share_send_new_email">Send new email</string>
+    <string name="share_dialog_title">Sharing</string>
+    <string name="share_file">Share %1$s</string>
+    <string name="share_expiration_date_label">Expires %1$s</string>
+    <string name="share_expiration_date_format">%1$s</string>
+    <string name="share_no_expiration_date_label">Set expiration date</string>
+    <string name="share_via_link_section_title">Share link</string>
+    <string name="share_via_link_send_link_label">Send link</string>
+    <string name="share_password_title">Password-protected</string>
+    <string name="share_no_password_title">Set password</string>
+    <string name="share_with_title">Share with…</string>
+    <string name="share_via_link_unset_password">Unset</string>
+    <string name="add_another_public_share_link">Add another link</string>
+    <string name="add_new_public_share">Add new public share link</string>
+    <string name="public_share_name">New name</string>
+    <string name="share_link_with_label">Share link (%1$s)</string>
+    <string name="share_link">Share link</string>
+    <string name="allow_resharing">Allow resharing</string>
+    <string name="link_share_view_only">View only</string>
+    <string name="link_share_editing">Editing</string>
+    <string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
+    <string name="link_share_file_drop">File drop (upload only)</string>
+    <string name="could_not_retrieve_shares">Could not retrieve shares</string>
+    <string name="share_permission_view_only">View only</string>
+    <string name="share_permission_can_edit">Can edit</string>
+    <string name="share_permission_file_drop">File drop</string>
+    <string name="share_permission_secure_file_drop">Secure file drop</string>
+    <string name="share_permissions">Share Permissions</string>
+    <plurals name="share_download_limit_description">
+        <item quantity="one">%1$d download remaining</item>
+        <item quantity="other">%1$d downloads remaining</item>
+    </plurals>
+    <string name="username">Username</string>
+    <string name="share_group_clarification">%1$s (group)</string>
+    <string name="share_remote_clarification">%1$s (remote)</string>
+    <string name="share_room_clarification">%1$s (conversation)</string>
+    <string name="share_known_remote_on_clarification">on %1$s</string>
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Link copied</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 3b295593a..07f1c940a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -35,7 +35,10 @@
          </trusted-key>
          <trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E" group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.5.2"/>
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
-         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
+         <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638">
+            <trusting group="org.checkerframework" name="checker-compat-qual" version="2.5.5"/>
+            <trusting group="org.checkerframework" name="checker-qual"/>
+         </trusted-key>
          <trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
          <trusted-key id="1D9AA7F9E1E2824728B8CD1794B291AEF984A085" group="io.reactivex.rxjava2"/>
          <trusted-key id="24D04176586361FDA94EE0315F7786DF73E61F56" group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.0-1.0.13"/>
@@ -107,6 +110,7 @@
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
             <trusting group="androidx.tracing" name="tracing" version="1.2.0"/>
+            <trusting group="androidx.tracing" name="tracing-ktx" version="1.2.0"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -130,15 +134,18 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.collection"/>
+            <trusting group="androidx.concurrent"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.graphics"/>
             <trusting group="androidx.lifecycle"/>
+            <trusting group="androidx.recyclerview" name="recyclerview" version="1.4.0"/>
             <trusting group="androidx.test"/>
             <trusting group="androidx.test.espresso" name="espresso-idling-resource" version="3.6.1"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
+            <trusting group="androidx.work" name="work-runtime" version="2.10.0"/>
             <trusting group="androidx.work" name="work-runtime" version="2.9.1"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
@@ -1521,6 +1528,11 @@
             <sha256 value="179fc4d2d022c0a8247e7612feab40b951bd8710f6b452e3ed6dc03a1e52769d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.recyclerview" name="recyclerview" version="1.4.0">
+         <artifact name="recyclerview-1.4.0.aar">
+            <sha256 value="0f32ccaffcda74c3f87f0b4cfe6ae78e8aa4eb3ad7dda4f2edf06eedc947a5cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.recyclerview" name="recyclerview-selection" version="1.1.0">
          <artifact name="recyclerview-selection-1.1.0.aar">
             <sha256 value="9e2ba1c7d6b0eb5e64c10b1b0eb01b51e8511cee002c9bd56ce9cc138ebc4898" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5040,6 +5052,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="3d422b28376339c0fbd772e480dbbdc56b7ae1a1">
          <artifact name="android-library-3d422b28376339c0fbd772e480dbbdc56b7ae1a1.aar">
             <sha256 value="58debdb6fecf8f254f38bed011ea4849405017679c7978755e2a004031b3f69e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6389,6 +6409,14 @@
             <sha256 value="5777d292251c7895c04a4c57015683ec3b353a12486c9b3e7178e9b0b3c38fff" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-logging" name="commons-logging" version="1.0.4">
+         <artifact name="commons-logging-1.0.4.jar">
+            <sha256 value="e94af49749384c11f5aa50e8d0f5fe679be771295b52030338d32843c980351e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-logging-1.0.4.pom">
+            <sha256 value="65d310509352b5425118225ee600a01f83ba72142d035014b5d164bc04b2d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.jar">
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>

From 5b96d8ae6162b4b7abc2c6256c555bb82ef69e43 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 3 Feb 2025 15:21:40 +0100
Subject: [PATCH 092/138] fix build

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/dao/ShareDao.kt         |  10 +-
 .../notes/share/NoteShareActivity.java        | 384 ++++++++++++------
 2 files changed, 255 insertions(+), 139 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 15ab98f80..97f27cac0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Query("SELECT * FROM share_table WHERE path = :path")
-    fun getShareEntities(path: String): List<ShareEntity>
+    @Insert
+    fun addShareEntity(entity: ShareEntity)
+
+    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
+    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 0401416eb..25408bd48 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,6 +14,7 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -26,11 +27,17 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
+import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +45,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
+import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
@@ -46,24 +55,26 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
-import it.niedermann.owncloud.notes.share.dialog.NoteShareActivityShareItemActionBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
-import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
+import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
+import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
+import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
-import it.niedermann.owncloud.notes.shared.model.Capabilities;
+import it.niedermann.owncloud.notes.shared.user.User;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
-import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -77,8 +88,8 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
+    private ClientFactoryImpl clientFactory;
     private ShareRepository repository;
-    private Capabilities capabilities;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -99,12 +110,12 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        executorService.schedule(() -> {
+        clientFactory = new ClientFactoryImpl(this);
+
+        new Thread(() -> {{
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
-                capabilities = repository.capabilities();
-                repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
@@ -119,7 +130,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
+        }}).start();
     }
 
     @Override
@@ -137,6 +148,23 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
+
+        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
+
+        // TODO: When to disable?
+        // binding.pickContactEmailBtn.setVisibility(View.GONE);
+        // disableSearchView(binding.searchView);
+
+        /*
+        if (file.canReshare()) {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
+        } else {
+            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
+            binding.searchView.setInputType(InputType.TYPE_NULL);
+            binding.pickContactEmailBtn.setVisibility(View.GONE);
+            disableSearchView(binding.searchView);
+        }
+         */
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -145,7 +173,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null, account);
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -179,16 +207,11 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    if (capabilities == null) {
-                        Log_OC.d(TAG, "Capabilities cannot be null");
-                        return;
-                    }
-
-                    final var isFederationShareAllowed = capabilities.getFederationShare();
-                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
-                        runOnUiThread(() -> {
-                            {
+                    try {
+                        provider.searchForUsersOrGroups(newText, cursor -> {
+                            runOnUiThread(() -> {{
                                 if (cursor == null || cursor.getCount() == 0) {
+                                    suggestionAdapter.changeCursor(null);
                                     return;
                                 }
 
@@ -197,7 +220,7 @@ public boolean onQueryTextChange(String newText) {
                                 }
 
                                 binding.progressBar.setVisibility(View.GONE);
-                            }
+                            }});
                         });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
@@ -243,60 +266,74 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
-        String displayName = account.getDisplayName();
-        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
+        String noteId = String.valueOf(note.getAccountId());
+        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
     }
 
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
-        }
-    }
+        } else {
 
-    public void copyInternalLink() {
-        if (account == null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
-            return;
-        }
+            /*
+            // TODO: How to get owner display name from note?
 
-        final var link = createInternalLink();
-        showShareLinkDialog(link);
-    }
+             binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
+             */
 
-    @Override
-    public void createPublicShareLink() {
-        if (capabilities == null) {
-            Log_OC.d(TAG, "Capabilities cannot be null");
-            return;
-        }
 
-        if (capabilities.getPublicPasswordEnforced() || capabilities.getAskForOptionalPassword()) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true, capabilities.getAskForOptionalPassword());
-        } else {
-            executorService.schedule(() -> {
-                final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
-                if (result != null) {
-                    note.setIsShared(true);
-                    repository.updateNote(note);
-                    runOnUiThread(this::recreate);
-                }
-            }, 0, TimeUnit.MICROSECONDS);
+            loadAvatar();
+
+            /*
+            // TODO: Note's note?
+            String note = file.getNote();
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(file.getNote());
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
+             */
         }
     }
 
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note, createShare, askForPassword);
-        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    private void loadAvatar() {
+        Glide.with(this)
+                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
+                .placeholder(R.drawable.ic_account_circle_grey_24dp)
+                .error(R.drawable.ic_account_circle_grey_24dp)
+                .apply(RequestOptions.circleCropTransform())
+                .into(binding.sharedWithYouAvatar);
+
+        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
     }
 
-    @Override
-    public void createSecureFileDrop() {
+    public void copyInternalLink() {
+        if (account == null) {
+            DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
+            return;
+        }
 
+        showShareLinkDialog();
     }
 
-    private void showShareLinkDialog(String link) {
+    private void showShareLinkDialog() {
+        String link = createInternalLink();
+
         Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
 
         intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
@@ -313,31 +350,85 @@ private String createInternalLink() {
         return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
-    @Override
-    public void copyLink(OCShare share) {
-        if (!note.isShared()) {
-            return;
+    // TODO: Capabilities in notes app doesn't have following functions...
+    public void createPublicShareLink() {
+        /*
+        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
+                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true,
+                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
+
+        } else {
+            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
+            // Is CreateShareViaLink operation compatible?
+
+            Intent service = new Intent(fileActivity, OperationsService.class);
+            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
+            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
+            if (!TextUtils.isEmpty(password)) {
+                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
+            }
+            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
         }
+         */
+    }
+
+    public void createSecureFileDrop() {
+        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
+    }
 
-        if (TextUtils.isEmpty(share.getShareLink())) {
-            copyAndShareFileLink(share.getShareLink());
+    /*
+    // TODO: Cant call getFileWithLink
+
+     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
+        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
+                                                                                       ShareType.PUBLIC_LINK,
+                                                                                       "");
+
+        if (shares.size() == SINGLE_LINK_SIZE) {
+            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
         } else {
-            ClipboardUtil.copyToClipboard(this, share.getShareLink());
+            if (fileActivity instanceof FileDisplayActivity) {
+                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
+            } else {
+                showShareFile(file);
+            }
         }
+
+        fileActivity.refreshList();
+    }
+     */
+    private void showSendLinkTo(OCShare publicShare) {
+        /*
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(publicShare.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                // TODO: get link from public share and pass to the function
+                showShareLinkDialog();
+            }
+        }
+         */
     }
 
-    private void copyAndShareFileLink(String link) {
-        ClipboardUtil.copyToClipboard(this, link, false);
-        Snackbar snackbar = Snackbar
-                .make(this.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG)
-                .setAction(R.string.share, v -> showShareLinkDialog(link));
-        snackbar.show();
+    public void copyLink(OCShare share) {
+        /*
+        if (file.isSharedViaLink()) {
+            if (TextUtils.isEmpty(share.getShareLink())) {
+                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
+            } else {
+                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+            }
+        }
+         */
     }
 
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
         if (!this.isFinishing()) {
-            new NoteShareActivityShareItemActionBottomSheetDialog(this, this, share).show();
+            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
         }
     }
 
@@ -346,6 +437,41 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
+    public void onUpdateShareInformation(RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            refreshUiFromDB();
+        } else {
+            setupView();
+        }
+    }
+
+    /**
+     * Get {@link OCShare} instance from DB and updates the UI.
+     */
+    private void refreshUiFromDB() {
+        refreshSharesFromDB();
+        // Updates UI with new state
+        setupView();
+    }
+
+    private void unshareWith(OCShare share) {
+        repository.removeShare(share.getId());
+    }
+
+    /**
+     * Starts a dialog that requests a password to the user to protect a share link.
+     *
+     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
+     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
+     * @param askForPassword if true, password is optional
+     */
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
+                createShare,
+                askForPassword);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
@@ -353,15 +479,31 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     }
 
     @Override
-    public void showProfileBottomSheet(Account account, String shareWith) {
+    public void showProfileBottomSheet(User user, String shareWith) {
+        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
+            new RetrieveHoverCardAsyncTask(user,
+                    account,
+                    shareWith,
+                    this,
+                    clientFactory).execute();
+        }
     }
 
+    /**
+     * Get known server capabilities from DB
+     */
     public void refreshCapabilitiesFromDB() {
+        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
+    /**
+     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
+     * before reading database.
+     */
     public void refreshSharesFromDB() {
-        executorService.schedule(() -> {
+        new Thread(() -> {
             try {
+                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
@@ -374,8 +516,8 @@ public void refreshSharesFromDB() {
                 // to show share with users/groups info
                 List<OCShare> shares = new ArrayList<>();
 
-                if (note != null) {
-                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
+                if (note != null && note.getRemoteId() != null) {
+                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
@@ -388,26 +530,25 @@ public void refreshSharesFromDB() {
 
                 runOnUiThread(() -> {
                     adapter.addShares(shares);
-                    addPublicShares(adapter);
+
+                    // TODO: Will be added later on...
+                    List<OCShare> publicShares = new ArrayList<>();
+
+                    if (containsNoNewPublicShare(adapter.getShares())) {
+                        final OCShare ocShare = new OCShare();
+                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+                        publicShares.add(ocShare);
+                    } else {
+                        adapter.removeNewPublicShare();
+                    }
+
+                    adapter.addShares(publicShares);
                 });
             } catch (Exception e) {
-                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
+                throw new RuntimeException(e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
-    }
-
-    private void addPublicShares(ShareeListAdapter adapter) {
-        List<OCShare> publicShares = new ArrayList<>();
-
-        if (containsNoNewPublicShare(adapter.getShares())) {
-            final OCShare ocShare = new OCShare();
-            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-            publicShares.add(ocShare);
-        } else {
-            adapter.removeNewPublicShare();
-        }
+        }).start();
 
-        adapter.addShares(publicShares);
     }
 
     private void checkContactPermission() {
@@ -480,6 +621,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
     private boolean isReshareForbidden(OCShare share) {
         return false;
+        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -501,26 +643,24 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        executorService.schedule(() -> {
-            final var result = repository.removeShare(share, note);
-
-            runOnUiThread(() -> {
-                if (result) {
-                    ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-                    if (adapter == null) {
-                        DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.email_pick_failed));
-                        return;
-                    }
-                    adapter.remove(share);
-                } else {
-                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
-                }
-            });
-        }, 0, TimeUnit.MICROSECONDS);
+        unshareWith(share);
+        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+        if (adapter == null) {
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+            return;
+        }
+        adapter.remove(share);
     }
 
     @Override
     public void sendLink(OCShare share) {
+        /*
+        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
+            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
+        } else {
+            showSendLinkTo(share);
+        }
+         */
     }
 
     @Override
@@ -534,38 +674,19 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
         bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
         bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
         bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
-        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, getExpDateShown());
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
         startActivity(intent);
     }
 
-    private boolean getExpDateShown() {
-        try {
-            if (capabilities == null) {
-                Log_OC.d(TAG, "Capabilities cannot be null");
-                return false;
-            }
-
-            final var majorVersionAsString = capabilities.getNextcloudMajorVersion();
-            if (majorVersionAsString != null) {
-                final var majorVersion = Integer.parseInt(majorVersionAsString);
-                return majorVersion >= 18;
-            }
-
-            return false;
-        } catch (NumberFormatException e) {
-            Log_OC.d(TAG, "Exception while getting expDateShown");
-            return false;
-        }
-    }
-
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
     }
 
+    //launcher for contact permission
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
@@ -576,6 +697,7 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 }
             });
 
+    //launcher to handle contact selection
     private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                     result -> {
@@ -606,10 +728,4 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
-
-    @Override
-    protected void onDestroy() {
-        executorService.shutdown();
-        super.onDestroy();
-    }
 }

From 7446b350206b0bba9287a02ac8b9656d003267ff Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:07:33 +0100
Subject: [PATCH 093/138] add createPublicShareLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 364 ++++++------------
 1 file changed, 120 insertions(+), 244 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 25408bd48..4295b1896 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,7 +14,6 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -27,17 +26,12 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
-import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
-import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.NextcloudVersion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,9 +39,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
@@ -55,26 +47,25 @@
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.persistence.entity.ShareEntity;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
 import it.niedermann.owncloud.notes.share.adapter.SuggestionAdapter;
-import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
+import it.niedermann.owncloud.notes.share.dialog.NoteShareActivityShareItemActionBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
+import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.CreateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
-import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
-import it.niedermann.owncloud.notes.shared.user.User;
+import it.niedermann.owncloud.notes.shared.model.Capabilities;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
+import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -88,8 +79,8 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityNoteShareBinding binding;
     private Note note;
     private Account account;
-    private ClientFactoryImpl clientFactory;
     private ShareRepository repository;
+    private Capabilities capabilities;
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -110,12 +101,12 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        clientFactory = new ClientFactoryImpl(this);
-
-        new Thread(() -> {{
+        executorService.schedule(() -> {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
+                capabilities = repository.capabilities();
+                repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
@@ -130,7 +121,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }}).start();
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override
@@ -148,23 +139,6 @@ public void onStop() {
     private void setupView() {
         setShareWithYou();
         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
-        // TODO: When to disable?
-        // binding.pickContactEmailBtn.setVisibility(View.GONE);
-        // disableSearchView(binding.searchView);
-
-        /*
-        if (file.canReshare()) {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
-        } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-            binding.searchView.setInputType(InputType.TYPE_NULL);
-            binding.pickContactEmailBtn.setVisibility(View.GONE);
-            disableSearchView(binding.searchView);
-        }
-         */
     }
 
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
@@ -173,7 +147,7 @@ private void setupSearchView(@Nullable SearchManager searchManager, ComponentNam
             return;
         }
 
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null);
+        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(this, null, account);
         UsersAndGroupsSearchProvider provider = new UsersAndGroupsSearchProvider(this, repository);
 
         binding.searchView.setSuggestionsAdapter(suggestionAdapter);
@@ -207,11 +181,16 @@ public boolean onQueryTextChange(String newText) {
 
                 // Schedule a new task with a delay
                 future = executorService.schedule(() -> {
-                    try {
-                        provider.searchForUsersOrGroups(newText, cursor -> {
-                            runOnUiThread(() -> {{
+                    if (capabilities == null) {
+                        Log_OC.d(TAG, "Capabilities cannot be null");
+                        return;
+                    }
+
+                    final var isFederationShareAllowed = capabilities.getFederationShare();
+                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
+                        runOnUiThread(() -> {
+                            {
                                 if (cursor == null || cursor.getCount() == 0) {
-                                    suggestionAdapter.changeCursor(null);
                                     return;
                                 }
 
@@ -220,7 +199,7 @@ public boolean onQueryTextChange(String newText) {
                                 }
 
                                 binding.progressBar.setVisibility(View.GONE);
-                            }});
+                            }
                         });
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
@@ -266,62 +245,17 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
         startActivity(intent);
     }
 
-    private void disableSearchView(View view) {
-        view.setEnabled(false);
-
-        if (view instanceof ViewGroup viewGroup) {
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                disableSearchView(viewGroup.getChildAt(i));
-            }
-        }
-    }
-
-    // TODO: Check if note.getAccountId() return note's owner's id
     private boolean accountOwnsFile() {
-        String noteId = String.valueOf(note.getAccountId());
-        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
+        String displayName = account.getDisplayName();
+        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
     }
 
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
-        } else {
-
-            /*
-            // TODO: How to get owner display name from note?
-
-             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
-             */
-
-
-            loadAvatar();
-
-            /*
-            // TODO: Note's note?
-            String note = file.getNote();
-
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
-            }
-             */
         }
     }
 
-    private void loadAvatar() {
-        Glide.with(this)
-                .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                .error(R.drawable.ic_account_circle_grey_24dp)
-                .apply(RequestOptions.circleCropTransform())
-                .into(binding.sharedWithYouAvatar);
-
-        binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
-    }
-
     public void copyInternalLink() {
         if (account == null) {
             DisplayUtils.showSnackMessage(this, getString(R.string.note_share_activity_could_not_retrieve_url));
@@ -331,6 +265,33 @@ public void copyInternalLink() {
         showShareLinkDialog();
     }
 
+    @Override
+    public void createPublicShareLink() {
+        if (capabilities == null) {
+            Log_OC.d(TAG, "Capabilities cannot be null");
+            return;
+        }
+
+        if (capabilities.getPublicPasswordEnforced() || capabilities.getAskForOptionalPassword()) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true, capabilities.getAskForOptionalPassword());
+        } else {
+            executorService.schedule(() -> {
+                repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
+            }, 0, TimeUnit.MICROSECONDS);
+        }
+    }
+
+    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note, createShare, askForPassword);
+        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
+    }
+
+    @Override
+    public void createSecureFileDrop() {
+
+    }
+
     private void showShareLinkDialog() {
         String link = createInternalLink();
 
@@ -350,85 +311,25 @@ private String createInternalLink() {
         return baseUri + "/index.php/f/" +  note.getRemoteId();
     }
 
-    // TODO: Capabilities in notes app doesn't have following functions...
-    public void createPublicShareLink() {
-        /*
-        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
-            // Is CreateShareViaLink operation compatible?
-
-            Intent service = new Intent(fileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
-            if (!TextUtils.isEmpty(password)) {
-                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            }
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-        }
-         */
-    }
-
-    public void createSecureFileDrop() {
-        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
-    }
-
-    /*
-    // TODO: Cant call getFileWithLink
-
-     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
-        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
-                                                                                       ShareType.PUBLIC_LINK,
-                                                                                       "");
-
-        if (shares.size() == SINGLE_LINK_SIZE) {
-            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
-        } else {
-            if (fileActivity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
-            } else {
-                showShareFile(file);
-            }
-        }
-
-        fileActivity.refreshList();
-    }
-     */
-    private void showSendLinkTo(OCShare publicShare) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(publicShare.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                // TODO: get link from public share and pass to the function
-                showShareLinkDialog();
-            }
-        }
-         */
-    }
-
+    @Override
     public void copyLink(OCShare share) {
         /*
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(share.getShareLink())) {
                 fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
             } else {
-                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
+                ClipboardUtil.copyToClipboard(this, share.getShareLink());
             }
         }
          */
+
+        ClipboardUtil.copyToClipboard(this, share.getShareLink());
     }
 
     @Override
     public void showSharingMenuActionSheet(OCShare share) {
         if (!this.isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(this, this, share).show();
+            new NoteShareActivityShareItemActionBottomSheetDialog(this, this, share).show();
         }
     }
 
@@ -437,41 +338,6 @@ public void showPermissionsDialog(OCShare share) {
         new QuickSharingPermissionsBottomSheetDialog(this, this, share).show();
     }
 
-    public void onUpdateShareInformation(RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            refreshUiFromDB();
-        } else {
-            setupView();
-        }
-    }
-
-    /**
-     * Get {@link OCShare} instance from DB and updates the UI.
-     */
-    private void refreshUiFromDB() {
-        refreshSharesFromDB();
-        // Updates UI with new state
-        setupView();
-    }
-
-    private void unshareWith(OCShare share) {
-        repository.removeShare(share.getId());
-    }
-
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
-     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
-     * @param askForPassword if true, password is optional
-     */
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
-                createShare,
-                askForPassword);
-        dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
@@ -479,31 +345,15 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     }
 
     @Override
-    public void showProfileBottomSheet(User user, String shareWith) {
-        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            new RetrieveHoverCardAsyncTask(user,
-                    account,
-                    shareWith,
-                    this,
-                    clientFactory).execute();
-        }
+    public void showProfileBottomSheet(Account account, String shareWith) {
     }
 
-    /**
-     * Get known server capabilities from DB
-     */
     public void refreshCapabilitiesFromDB() {
-        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
     }
 
-    /**
-     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
-     * before reading database.
-     */
     public void refreshSharesFromDB() {
-        new Thread(() -> {
+        executorService.schedule(() -> {
             try {
-                final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
@@ -516,8 +366,8 @@ public void refreshSharesFromDB() {
                 // to show share with users/groups info
                 List<OCShare> shares = new ArrayList<>();
 
-                if (note != null && note.getRemoteId() != null) {
-                    final var shareEntities = repository.getShareEntities(note.getRemoteId(), ssoAcc.name);
+                if (note != null) {
+                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
                             final var share = repository.getShares(entity.getId());
@@ -530,25 +380,26 @@ public void refreshSharesFromDB() {
 
                 runOnUiThread(() -> {
                     adapter.addShares(shares);
-
-                    // TODO: Will be added later on...
-                    List<OCShare> publicShares = new ArrayList<>();
-
-                    if (containsNoNewPublicShare(adapter.getShares())) {
-                        final OCShare ocShare = new OCShare();
-                        ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-                        publicShares.add(ocShare);
-                    } else {
-                        adapter.removeNewPublicShare();
-                    }
-
-                    adapter.addShares(publicShares);
+                    addPublicShares(adapter);
                 });
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
             }
-        }).start();
+        }, 0, TimeUnit.MICROSECONDS);
+    }
+
+    private void addPublicShares(ShareeListAdapter adapter) {
+        List<OCShare> publicShares = new ArrayList<>();
+
+        if (containsNoNewPublicShare(adapter.getShares())) {
+            final OCShare ocShare = new OCShare();
+            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
+            publicShares.add(ocShare);
+        } else {
+            adapter.removeNewPublicShare();
+        }
 
+        adapter.addShares(publicShares);
     }
 
     private void checkContactPermission() {
@@ -621,7 +472,6 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
     private boolean isReshareForbidden(OCShare share) {
         return false;
-        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
     }
 
     @VisibleForTesting
@@ -643,24 +493,26 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        unshareWith(share);
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-        if (adapter == null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-            return;
-        }
-        adapter.remove(share);
+        executorService.schedule(() -> {
+            final var result = repository.removeShare(share.getId());
+
+            runOnUiThread(() -> {
+                if (result) {
+                    ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
+                    if (adapter == null) {
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.email_pick_failed));
+                        return;
+                    }
+                    adapter.remove(share);
+                } else {
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
+                }
+            });
+        }, 0, TimeUnit.MICROSECONDS);
     }
 
     @Override
     public void sendLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
-            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
-        } else {
-            showSendLinkTo(share);
-        }
-         */
     }
 
     @Override
@@ -674,19 +526,38 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
         bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share);
         bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission);
         bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share));
-        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)
+        bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, getExpDateShown());
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
         startActivity(intent);
     }
 
+    private boolean getExpDateShown() {
+        try {
+            if (capabilities == null) {
+                Log_OC.d(TAG, "Capabilities cannot be null");
+                return false;
+            }
+
+            final var majorVersionAsString = capabilities.getNextcloudMajorVersion();
+            if (majorVersionAsString != null) {
+                final var majorVersion = Integer.parseInt(majorVersionAsString);
+                return majorVersion >= 18;
+            }
+
+            return false;
+        } catch (NumberFormatException e) {
+            Log_OC.d(TAG, "Exception while getting expDateShown");
+            return false;
+        }
+    }
+
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
        repository.updateSharePermission(share.getId(), permission);
     }
 
-    //launcher for contact permission
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
@@ -697,7 +568,6 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
                 }
             });
 
-    //launcher to handle contact selection
     private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
             registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                     result -> {
@@ -728,4 +598,10 @@ public void applyBrand(int color) {
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
     }
+
+    @Override
+    protected void onDestroy() {
+        executorService.shutdown();
+        super.onDestroy();
+    }
 }

From c82dedde89092d334208cf6edd4ccc5ee8a951ed Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 5 Feb 2025 16:18:39 +0100
Subject: [PATCH 094/138] add copyAndShareFileLink

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java    | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 4295b1896..77cc5d39e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -323,7 +323,19 @@ public void copyLink(OCShare share) {
         }
          */
 
-        ClipboardUtil.copyToClipboard(this, share.getShareLink());
+        if (TextUtils.isEmpty(share.getShareLink())) {
+            copyAndShareFileLink(share.getShareLink());
+        } else {
+            ClipboardUtil.copyToClipboard(this, share.getShareLink());
+        }
+    }
+
+    private void copyAndShareFileLink(String link) {
+        ClipboardUtil.copyToClipboard(this, link, false);
+        Snackbar snackbar = Snackbar
+                .make(this.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG)
+                .setAction(R.string.share, v -> showShareLinkDialog());
+        snackbar.show();
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 944bfa5c3..1d238f50a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,6 +126,7 @@
     <string name="share_known_remote_on_clarification">on %1$s</string>
 
     <string name="copy_link">Copy link</string>
+    <string name="share">Share</string>
     <string name="clipboard_text_copied">Link copied</string>
     <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>
     <string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>

From 5fb241954f5bfe74e2aeb09cc8244ff176096f81 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 10 Feb 2025 09:42:18 +0100
Subject: [PATCH 095/138] add setShareWithYou

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java | 17 +++++++++++++++++
 app/src/main/res/layout/activity_note_share.xml |  1 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 77cc5d39e..9c96341a8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -53,6 +53,7 @@
 import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
 import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
 import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
+import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
@@ -253,6 +254,22 @@ private boolean accountOwnsFile() {
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
+        } else {
+            // TODO: ADD
+            binding.sharedWithYouUsername.setText(
+                    String.format(getString(R.string.note_share_activity_shared_with_you), "file.getOwnerDisplayName()"));
+            AvatarLoader.INSTANCE.load(this,binding.sharedWithYouAvatar,account);
+            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
+
+            // TODO: ADD
+            String note = "file.getNote()";
+
+            if (!TextUtils.isEmpty(note)) {
+                binding.sharedWithYouNote.setText(note);
+                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+            } else {
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index b4667a60b..7310f6938 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -80,7 +80,6 @@
     <!-- // TODO: Implement later ... -->
     <LinearLayout
         android:id="@+id/shared_with_you_container"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacer_1x"

From 2c3bbf474571c0805b3cadcc36ff5e20d825f0cb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 10 Feb 2025 14:22:26 +0100
Subject: [PATCH 096/138] fix else logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 9c96341a8..183f73c8b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -82,6 +82,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private Account account;
     private ShareRepository repository;
     private Capabilities capabilities;
+    private final List<OCShare> shares = new ArrayList<>();
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,7 +116,7 @@ private void initializeArguments() {
                     binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
                     binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
 
-                    setupView();
+                    setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
                     refreshCapabilitiesFromDB();
                     refreshSharesFromDB();
                 });
@@ -137,11 +138,6 @@ public void onStop() {
         UsersAndGroupsSearchConfig.INSTANCE.reset();
     }
 
-    private void setupView() {
-        setShareWithYou();
-        setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
-    }
-
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
         if (searchManager == null) {
             binding.searchView.setVisibility(View.GONE);
@@ -255,17 +251,22 @@ private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
         } else {
-            // TODO: ADD
+            final var remoteId = note.getRemoteId();
+            if (remoteId == null) {
+                return;
+            }
+
+            final var share = shares.get(remoteId.intValue());
+
             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_activity_shared_with_you), "file.getOwnerDisplayName()"));
-            AvatarLoader.INSTANCE.load(this,binding.sharedWithYouAvatar,account);
+                    String.format(getString(R.string.note_share_activity_shared_with_you), share.getOwnerDisplayName()));
+            AvatarLoader.INSTANCE.load(this, binding.sharedWithYouAvatar, account);
             binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
 
-            // TODO: ADD
-            String note = "file.getNote()";
+            String description = share.getNote();
 
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(note);
+            if (!TextUtils.isEmpty(description)) {
+                binding.sharedWithYouNote.setText(description);
                 binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
             } else {
                 binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
@@ -393,8 +394,6 @@ public void refreshSharesFromDB() {
                 adapter.getShares().clear();
 
                 // to show share with users/groups info
-                List<OCShare> shares = new ArrayList<>();
-
                 if (note != null) {
                     final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
@@ -410,6 +409,7 @@ public void refreshSharesFromDB() {
                 runOnUiThread(() -> {
                     adapter.addShares(shares);
                     addPublicShares(adapter);
+                    setShareWithYou();
                 });
             } catch (Exception e) {
                 Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);

From 88bf3fd69e6cb9ee719774fa4a4194c73719f713 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 10 Feb 2025 14:24:01 +0100
Subject: [PATCH 097/138] remove unnecessary delay logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 183f73c8b..deec150c0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -29,7 +29,6 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
@@ -57,7 +56,6 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.CreateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -103,7 +101,7 @@ private void initializeArguments() {
             throw new IllegalArgumentException("Account cannot be null");
         }
 
-        executorService.schedule(() -> {
+        executorService.submit(() -> {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
@@ -123,7 +121,7 @@ private void initializeArguments() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
+        });
     }
 
     @Override
@@ -280,7 +278,8 @@ public void copyInternalLink() {
             return;
         }
 
-        showShareLinkDialog();
+        final var link = createInternalLink();
+        showShareLinkDialog(link);
     }
 
     @Override
@@ -294,9 +293,14 @@ public void createPublicShareLink() {
             // password enforced by server, request to the user before trying to create
             requestPasswordForShareViaLink(true, capabilities.getAskForOptionalPassword());
         } else {
-            executorService.schedule(() -> {
-                repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
-            }, 0, TimeUnit.MICROSECONDS);
+            executorService.submit(() -> {
+                final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
+                if (result != null) {
+                    note.setIsShared(true);
+                    repository.updateNote(note);
+                    runOnUiThread(this::recreate);
+                }
+            });
         }
     }
 
@@ -310,9 +314,7 @@ public void createSecureFileDrop() {
 
     }
 
-    private void showShareLinkDialog() {
-        String link = createInternalLink();
-
+    private void showShareLinkDialog(String link) {
         Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
 
         intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
@@ -331,15 +333,9 @@ private String createInternalLink() {
 
     @Override
     public void copyLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(share.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                ClipboardUtil.copyToClipboard(this, share.getShareLink());
-            }
+        if (!note.isShared()) {
+            return;
         }
-         */
 
         if (TextUtils.isEmpty(share.getShareLink())) {
             copyAndShareFileLink(share.getShareLink());
@@ -352,7 +348,7 @@ private void copyAndShareFileLink(String link) {
         ClipboardUtil.copyToClipboard(this, link, false);
         Snackbar snackbar = Snackbar
                 .make(this.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG)
-                .setAction(R.string.share, v -> showShareLinkDialog());
+                .setAction(R.string.share, v -> showShareLinkDialog(link));
         snackbar.show();
     }
 
@@ -382,7 +378,7 @@ public void refreshCapabilitiesFromDB() {
     }
 
     public void refreshSharesFromDB() {
-        executorService.schedule(() -> {
+        executorService.submit(() -> {
             try {
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
@@ -414,7 +410,7 @@ public void refreshSharesFromDB() {
             } catch (Exception e) {
                 Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
             }
-        }, 0, TimeUnit.MICROSECONDS);
+        });
     }
 
     private void addPublicShares(ShareeListAdapter adapter) {
@@ -522,8 +518,8 @@ public void sendNewEmail(OCShare share) {
 
     @Override
     public void unShare(OCShare share) {
-        executorService.schedule(() -> {
-            final var result = repository.removeShare(share.getId());
+        executorService.submit(() -> {
+            final var result = repository.removeShare(share, note);
 
             runOnUiThread(() -> {
                 if (result) {
@@ -537,7 +533,7 @@ public void unShare(OCShare share) {
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.failed_the_remove_share));
                 }
             });
-        }, 0, TimeUnit.MICROSECONDS);
+        });
     }
 
     @Override

From e8c4131de02eb8425a0eb0461894c6a6ed6596e6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 10 Feb 2025 14:44:28 +0100
Subject: [PATCH 098/138] fix

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index deec150c0..96bbf1c9a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -241,20 +241,24 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
     }
 
     private boolean accountOwnsFile() {
-        String displayName = account.getDisplayName();
-        return TextUtils.isEmpty(displayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(displayName);
+        if (shares.isEmpty()) {
+            return true;
+        }
+
+        final var share = shares.get(0);
+        String ownerDisplayName = share.getOwnerDisplayName();
+        return TextUtils.isEmpty(ownerDisplayName) || account.getAccountName().split("@")[0].equalsIgnoreCase(ownerDisplayName);
     }
 
     private void setShareWithYou() {
         if (accountOwnsFile()) {
             binding.sharedWithYouContainer.setVisibility(View.GONE);
         } else {
-            final var remoteId = note.getRemoteId();
-            if (remoteId == null) {
+            if (shares.isEmpty()) {
                 return;
             }
 
-            final var share = shares.get(remoteId.intValue());
+            final var share = shares.get(0);
 
             binding.sharedWithYouUsername.setText(
                     String.format(getString(R.string.note_share_activity_shared_with_you), share.getOwnerDisplayName()));

From 06839b67d311e129d3c6fa254eab095d3896da5f Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 10 Feb 2025 14:45:33 +0100
Subject: [PATCH 099/138] fix

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/res/layout/activity_note_share.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 7310f6938..6df68525c 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -77,7 +77,6 @@
         app:icon="@drawable/ic_share_white_24dp"
         app:iconGravity="start" />
 
-    <!-- // TODO: Implement later ... -->
     <LinearLayout
         android:id="@+id/shared_with_you_container"
         android:layout_width="match_parent"

From 48670cfd80e6e884cf42b9ab7c80fa0af9a53a23 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 14 Feb 2025 10:34:04 +0100
Subject: [PATCH 100/138] fix git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/dao/ShareDao.kt         |  10 +-
 .../notes/share/ClientFactoryImpl.java        |  84 ---
 .../share/CreateShareViaLinkOperation.java    |  91 ---
 .../notes/share/NoteShareFragment.java        | 692 ------------------
 .../owncloud/notes/share/SyncOperation.java   |  37 -
 .../owncloud/notes/shared/server/Server.kt    |  40 -
 .../owncloud/notes/shared/user/User.kt        |  56 --
 .../notes/shared/util/ClipboardUtil.kt        |  50 --
 app/src/main/res/layout/activity_row.xml      |   2 +-
 app/src/main/res/values/strings.xml           |  76 +-
 10 files changed, 59 insertions(+), 1079 deletions(-)
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
 delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
index 97f27cac0..15ab98f80 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Insert
-    fun addShareEntity(entity: ShareEntity)
-
-    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
-    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
+    @Query("SELECT * FROM share_table WHERE path = :path")
+    fun getShareEntities(path: String): List<ShareEntity>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java b/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
deleted file mode 100644
index b9c82d25e..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-
-package it.niedermann.owncloud.notes.share.operations;
-
-import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.PlainClient;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-
-import java.io.IOException;
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-public class ClientFactoryImpl implements ClientFactory {
-
-    private Context context;
-
-    public ClientFactoryImpl(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public OwnCloudClient create(User user) throws CreationException {
-        try {
-            return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context);
-        } catch (OperationCanceledException |
-            AuthenticatorException |
-            IOException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public NextcloudClient createNextcloudClient(User user) throws CreationException {
-        try {
-            return OwnCloudClientFactory.createNextcloudClient(user, context);
-        } catch (AccountUtils.AccountNotFoundException e) {
-            throw new CreationException(e);
-        }
-    }
-
-    @Override
-    public OwnCloudClient create(Account account)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context);
-    }
-
-    @Override
-    public OwnCloudClient create(Account account, Activity currentActivity)
-        throws OperationCanceledException, AuthenticatorException, IOException,
-        AccountUtils.AccountNotFoundException {
-        return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public OwnCloudClient create(Uri uri, boolean followRedirects) {
-        return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
-    }
-
-    @Override
-    public PlainClient createPlainClient() {
-        return new PlainClient(context);
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
deleted file mode 100644
index 509fce819..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/CreateShareViaLinkOperation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-import java.util.ArrayList;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-
-
-import it.niedermann.owncloud.notes.shared.user.User;
-
-/**
- * Creates a new public share for a given file
- */
-public class CreateShareViaLinkOperation extends SyncOperation {
-
-    private final String path;
-    private final String password;
-    private int permissions = OCShare.NO_PERMISSION;
-
-    public CreateShareViaLinkOperation(String path, String password, User user) {
-        super(user);
-
-        this.path = path;
-        this.password = password;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        CreateShareRemoteOperation createOp = new CreateShareRemoteOperation(path,
-                ShareType.PUBLIC_LINK,
-                "",
-                false,
-                password,
-                permissions);
-        createOp.setGetShareDetails(true);
-        RemoteOperationResult result = createOp.execute(client);
-
-        if (result.isSuccess()) {
-            if (result.getData().size() > 0) {
-                Object item = result.getData().get(0);
-                if (item instanceof OCShare) {
-                    updateData((OCShare) item);
-                } else {
-                    ArrayList<Object> data = result.getData();
-                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-                    result.setData(data);
-                }
-            } else {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-            }
-        }
-
-        return result;
-    }
-
-    private void updateData(OCShare share) {
-        // Update DB with the response
-        share.setPath(path);
-        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setFolder(true);
-        } else {
-            share.setFolder(false);
-        }
-
-        // TODO: Save share
-
-        /*
-        getStorageManager().saveShare(share);
-
-        // Update OCFile with data from share: ShareByLink  and publicLink
-        OCFile file = getStorageManager().getFileByEncryptedRemotePath(path);
-        if (file != null) {
-            file.setSharedViaLink(true);
-            getStorageManager().saveFile(file);
-        }
-         */
-
-    }
-
-    public String getPath() {
-        return this.path;
-    }
-
-    public String getPassword() {
-        return this.password;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
deleted file mode 100644
index 759c8a8f0..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.java
+++ /dev/null
@@ -1,692 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.SearchManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.widget.SearchView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.google.android.material.snackbar.Snackbar;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.NextcloudVersion;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl;
-import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
-import it.niedermann.owncloud.notes.databinding.FragmentNoteShareBinding;
-import it.niedermann.owncloud.notes.persistence.entity.Account;
-import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
-import it.niedermann.owncloud.notes.share.dialog.FileDetailSharingMenuBottomSheetDialog;
-import it.niedermann.owncloud.notes.share.dialog.QuickSharingPermissionsBottomSheetDialog;
-import it.niedermann.owncloud.notes.share.dialog.ShareLinkToDialog;
-import it.niedermann.owncloud.notes.share.dialog.SharePasswordDialogFragment;
-import it.niedermann.owncloud.notes.share.listener.FileDetailsSharingMenuBottomSheetActions;
-import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
-import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl;
-import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;
-import it.niedermann.owncloud.notes.shared.user.User;
-import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
-
-public class NoteShareFragment extends Fragment implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
-
-    private static final String TAG = "NoteShareFragment";
-    private static final String ARG_NOTE = "NOTE";
-    private static final String ARG_ACCOUNT = "ACCOUNT";
-    private static final String ARG_USER = "USER";
-    public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
-
-    private FragmentNoteShareBinding binding;
-    private Note note;
-    private User user;
-    private Account account;
-
-    private OnEditShareListener onEditShareListener;
-    private ClientFactoryImpl clientFactory;
-
-    public static NoteShareFragment newInstance(Note note, User user, Account account) {
-        NoteShareFragment fragment = new NoteShareFragment();
-        Bundle args = new Bundle();
-        args.putSerializable(ARG_NOTE, note);
-        args.putSerializable(ARG_ACCOUNT, account);
-        args.putParcelable(ARG_USER, user);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        clientFactory = new ClientFactoryImpl(requireContext());
-
-        if (savedInstanceState != null) {
-            note = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_NOTE, Note.class);
-            account = BundleExtensionsKt.getSerializableArgument(savedInstanceState, ARG_ACCOUNT, Account.class);
-            user = BundleExtensionsKt.getParcelableArgument(savedInstanceState, ARG_USER, User.class);
-        } else {
-            Bundle arguments = getArguments();
-            if (arguments != null) {
-                note = BundleExtensionsKt.getSerializableArgument(arguments, ARG_NOTE, Note.class);
-                account = BundleExtensionsKt.getSerializableArgument(arguments, ARG_ACCOUNT, Account.class);
-                user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class);
-            }
-        }
-
-        if (note == null) {
-            throw new IllegalArgumentException("Note cannot be null");
-        }
-
-        if (user == null) {
-            throw new IllegalArgumentException("Account cannot be null");
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        refreshCapabilitiesFromDB();
-        refreshSharesFromDB();
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        binding = FragmentNoteShareBinding.inflate(inflater, container, false);
-
-        binding.sharesList.setAdapter(new ShareeListAdapter(requireActivity(),
-                new ArrayList<>(),
-                this,
-                user,
-                account));
-
-        binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
-
-        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
-
-        setupView();
-
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        try {
-            onEditShareListener = (OnEditShareListener) context;
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Calling activity must implement the interface", e);
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        UsersAndGroupsSearchConfig.INSTANCE.reset();
-    }
-
-    private void setupView() {
-        setShareWithYou();
-
-        // OCFile parentFile = fileDataStorageManager.getFileById(file.getParentId());
-
-        setupSearchView((SearchManager) requireContext().getSystemService(Context.SEARCH_SERVICE), binding.searchView, requireActivity().getComponentName());
-        // viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
-
-        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-        binding.searchView.setInputType(InputType.TYPE_NULL);
-        binding.pickContactEmailBtn.setVisibility(View.GONE);
-        disableSearchView(binding.searchView);
-
-        /*
-        if (file.canReshare()) {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_search_text));
-        } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.note_share_fragment_resharing_not_allowed));
-            binding.searchView.setInputType(InputType.TYPE_NULL);
-            binding.pickContactEmailBtn.setVisibility(View.GONE);
-            disableSearchView(binding.searchView);
-        }
-         */
-
-    }
-
-    private void setupSearchView(@Nullable SearchManager searchManager, SearchView searchView,
-                                       ComponentName componentName) {
-        if (searchManager == null) {
-            searchView.setVisibility(View.GONE);
-            return;
-        }
-
-        // assumes parent activity is the searchable activity
-        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName));
-
-        // do not iconify the widget; expand it by default
-        searchView.setIconifiedByDefault(false);
-
-        // avoid fullscreen with softkeyboard
-        searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
-
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                // return true to prevent the query from being processed;
-                return true;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                // leave it for the parent listener in the hierarchy / default behaviour
-                return false;
-            }
-        });
-    }
-
-    private void disableSearchView(View view) {
-        view.setEnabled(false);
-
-        if (view instanceof ViewGroup viewGroup) {
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                disableSearchView(viewGroup.getChildAt(i));
-            }
-        }
-    }
-
-    // TODO: Check if note.getAccountId() return note's owner's id
-    private boolean accountOwnsFile() {
-        String noteId = String.valueOf(note.getAccountId());
-        return TextUtils.isEmpty(noteId) || account.getAccountName().split("@")[0].equalsIgnoreCase(noteId);
-    }
-
-    private void setShareWithYou() {
-        if (accountOwnsFile()) {
-            binding.sharedWithYouContainer.setVisibility(View.GONE);
-        } else {
-
-            /*
-            // TODO: How to get owner display name from note?
-
-             binding.sharedWithYouUsername.setText(
-                    String.format(getString(R.string.note_share_fragment_shared_with_you), file.getOwnerDisplayName()));
-             */
-
-
-            Glide.with(this)
-                    .load(new SingleSignOnUrl(account.getAccountName(), account.getUrl() + "/index.php/avatar/" + Uri.encode(account.getUserName()) + "/64"))
-                    .placeholder(R.drawable.ic_account_circle_grey_24dp)
-                    .error(R.drawable.ic_account_circle_grey_24dp)
-                    .apply(RequestOptions.circleCropTransform())
-                    .into(binding.sharedWithYouAvatar);
-
-            binding.sharedWithYouAvatar.setVisibility(View.VISIBLE);
-
-            /*
-            // TODO: Note's note?
-            String note = file.getNote();
-
-            if (!TextUtils.isEmpty(note)) {
-                binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
-            }
-             */
-        }
-    }
-
-    public void copyInternalLink() {
-        if (account == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.note_share_fragment_could_not_retrieve_url), Snackbar.LENGTH_LONG)
-                    .setAnchorView(binding.sharesList)
-                    .show();
-            return;
-        }
-
-        showShareLinkDialog();
-    }
-
-    private void showShareLinkDialog() {
-        String link = createInternalLink();
-
-        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
-
-        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
-        intentToShareLink.setType("text/plain");
-        intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_fragment_subject_shared_with_you, note.getTitle()));
-
-        String[] packagesToExclude = new String[] { requireContext().getPackageName() };
-        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(getParentFragmentManager(), FTAG_CHOOSER_DIALOG);
-    }
-
-    // TODO: Check account.getUrl returning base url?
-    private String createInternalLink() {
-        Uri baseUri = Uri.parse(account.getUrl());
-        return baseUri + "/index.php/f/" +  note.getId();
-    }
-
-    // TODO: Capabilities in notes app doesn't have following functions...
-    public void createPublicShareLink() {
-        /*
-        if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-                capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                    capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // TODO: Share files logic not suitable with notes app. How can I get remote path from remote id of the note
-            // Is CreateShareViaLink operation compatible?
-
-            Intent service = new Intent(fileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
-            if (!TextUtils.isEmpty(password)) {
-                service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            }
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-        }
-         */
-
-    }
-
-    public void createSecureFileDrop() {
-        // fileOperationsHelper.shareFolderViaSecureFileDrop(file);
-    }
-
-    /*
-    // TODO: Cant call getFileWithLink
-
-     public void getFileWithLink(@NonNull OCFile file, final ViewThemeUtils viewThemeUtils) {
-        List<OCShare> shares = fileActivity.getStorageManager().getSharesByPathAndType(file.getRemotePath(),
-                                                                                       ShareType.PUBLIC_LINK,
-                                                                                       "");
-
-        if (shares.size() == SINGLE_LINK_SIZE) {
-            FileActivity.copyAndShareFileLink(fileActivity, file, shares.get(0).getShareLink(), viewThemeUtils);
-        } else {
-            if (fileActivity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) fileActivity).showDetails(file, 1);
-            } else {
-                showShareFile(file);
-            }
-        }
-
-        fileActivity.refreshList();
-    }
-     */
-    private void showSendLinkTo(OCShare publicShare) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(publicShare.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                // TODO: get link from public share and pass to the function
-                showShareLinkDialog();
-            }
-        }
-         */
-
-    }
-
-    public void copyLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink()) {
-            if (TextUtils.isEmpty(share.getShareLink())) {
-                fileOperationsHelper.getFileWithLink(file, viewThemeUtils);
-            } else {
-                ClipboardUtil.copyToClipboard(requireActivity(), share.getShareLink());
-            }
-        }
-         */
-
-    }
-
-    @Override
-    public void showSharingMenuActionSheet(OCShare share) {
-        if (getActivity() != null && !getActivity().isFinishing()) {
-            new FileDetailSharingMenuBottomSheetDialog(getActivity(), this, share).show();
-        }
-    }
-
-    @Override
-    public void showPermissionsDialog(OCShare share) {
-        new QuickSharingPermissionsBottomSheetDialog(getActivity(), this, share).show();
-    }
-
-    public void onUpdateShareInformation(RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            refreshUiFromDB();
-        } else {
-            setupView();
-        }
-    }
-
-    /**
-     * Get {@link OCShare} instance from DB and updates the UI.
-     */
-    private void refreshUiFromDB() {
-        refreshSharesFromDB();
-        // Updates UI with new state
-        setupView();
-    }
-
-    private void unshareWith(OCShare share) {
-        // fileOperationsHelper.unshareShare(file, share);
-    }
-
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param createShare    When 'true', the request for password will be followed by the creation of a new public
-     *                       link; when 'false', a public share is assumed to exist, and the password is bound to it.
-     * @param askForPassword if true, password is optional
-     */
-    public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note,
-                createShare,
-                askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
-    @Override
-    public void requestPasswordForShare(OCShare share, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
-        dialog.show(getChildFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
-    }
-
-    @Override
-    public void showProfileBottomSheet(User user, String shareWith) {
-        if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            new RetrieveHoverCardAsyncTask(user,
-                    account,
-                    shareWith,
-                    getActivity(),
-                    clientFactory).execute();
-        }
-    }
-
-    /**
-     * Get known server capabilities from DB
-     */
-    public void refreshCapabilitiesFromDB() {
-        // capabilities = fileDataStorageManager.getCapability(user.getAccountName());
-    }
-
-    /**
-     * Get public link from the DB to fill in the "Share link" section in the UI. Takes into account server capabilities
-     * before reading database.
-     */
-    public void refreshSharesFromDB() {
-        /*
-        OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
-        if (newFile != null) {
-            file = newFile;
-        }
-
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-
-        if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.could_not_retrieve_shares), Snackbar.LENGTH_LONG)
-                    .show();
-            return;
-        }
-        adapter.getShares().clear();
-
-        // to show share with users/groups info
-        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
-                user.getAccountName());
-
-        adapter.addShares(shares);
-
-        if (FileDetailSharingFragmentHelper.isPublicShareDisabled(capabilities) || !file.canReshare()) {
-            return;
-        }
-
-        // Get public share
-        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
-                ShareType.PUBLIC_LINK,
-                "");
-
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
-            final OCShare ocShare = new OCShare();
-            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-            publicShares.add(ocShare);
-        } else {
-            adapter.removeNewPublicShare();
-        }
-
-        adapter.addShares(publicShares);
-         */
-
-    }
-
-    private void checkContactPermission() {
-        if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
-            pickContactEmail();
-        } else {
-            requestContactPermissionLauncher.launch(Manifest.permission.READ_CONTACTS);
-        }
-    }
-
-    private void pickContactEmail() {
-        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
-
-        if (intent.resolveActivity(requireContext().getPackageManager()) != null) {
-            onContactSelectionResultLauncher.launch(intent);
-        } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.file_detail_sharing_fragment_no_contact_app_message), Snackbar.LENGTH_LONG)
-                    .show();
-        }
-    }
-
-    private void handleContactResult(@NonNull Uri contactUri) {
-        // Define the projection to get all email addresses.
-        String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
-
-        Cursor cursor = requireActivity().getContentResolver().query(contactUri, projection, null, null, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                // The contact has only one email address, use it.
-                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
-                if (columnIndex != -1) {
-                    // Use the email address as needed.
-                    // email variable contains the selected contact's email address.
-                    String email = cursor.getString(columnIndex);
-                    binding.searchView.post(() -> {
-                        binding.searchView.setQuery(email, false);
-                        binding.searchView.requestFocus();
-                    });
-                } else {
-                    BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                            .show();
-                    Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address.");
-                }
-            } else {
-                BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                        .show();
-                Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as no Email found.");
-            }
-            cursor.close();
-        } else {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
-            Log_OC.e(NoteShareFragment.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
-        }
-    }
-
-    private boolean containsNoNewPublicShare(List<OCShare> shares) {
-        for (OCShare share : shares) {
-            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putSerializable(ARG_NOTE, note);
-        outState.putSerializable(ARG_ACCOUNT, account);
-        outState.putParcelable(ARG_USER, user);
-    }
-
-    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
-        binding.sharedWithYouAvatar.setImageDrawable(avatarDrawable);
-    }
-
-    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
-        return false;
-    }
-
-    private boolean isReshareForbidden(OCShare share) {
-        return false;
-        // return ShareType.FEDERATED == share.getShareType() || capabilities != null && capabilities.getFilesSharingResharing().isFalse();
-    }
-
-    @VisibleForTesting
-    public void search(String query) {
-        SearchView searchView = requireView().findViewById(R.id.searchView);
-        searchView.setQuery(query, true);
-    }
-
-    @Override
-    public void advancedPermissions(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
-    }
-
-
-    @Override
-    public void sendNewEmail(OCShare share) {
-        // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);
-    }
-
-    @Override
-    public void unShare(OCShare share) {
-        unshareWith(share);
-        ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
-        if (adapter == null) {
-            BrandedSnackbar.make(requireView(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                    .show();
-            return;
-        }
-        adapter.remove(share);
-    }
-
-    @Override
-    public void sendLink(OCShare share) {
-        /*
-        if (file.isSharedViaLink() && !TextUtils.isEmpty(share.getShareLink())) {
-            FileDisplayActivity.showShareLinkDialog(fileActivity, file, share.getShareLink());
-        } else {
-            showSendLinkTo(share);
-        }
-         */
-
-    }
-
-    @Override
-    public void addAnotherLink(OCShare share) {
-        createPublicShareLink();
-    }
-
-    private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        // onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
-    }
-
-    @Override
-    public void onQuickPermissionChanged(OCShare share, int permission) {
-       // fileOperationsHelper.setPermissionsToShare(share, permission);
-    }
-
-    //launcher for contact permission
-    private final ActivityResultLauncher<String> requestContactPermissionLauncher =
-            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
-                if (isGranted) {
-                    pickContactEmail();
-                } else {
-                    BrandedSnackbar.make(binding.getRoot(), getString(R.string.contact_no_permission), Snackbar.LENGTH_LONG)
-                            .show();
-                }
-            });
-
-    //launcher to handle contact selection
-    private final ActivityResultLauncher<Intent> onContactSelectionResultLauncher =
-            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
-                    result -> {
-                        if (result.getResultCode() == Activity.RESULT_OK) {
-                            Intent intent = result.getData();
-                            if (intent == null) {
-                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                                        .show();
-                                return;
-                            }
-
-                            Uri contactUri = intent.getData();
-                            if (contactUri == null) {
-                                BrandedSnackbar.make(binding.getRoot(), getString(R.string.email_pick_failed), Snackbar.LENGTH_LONG)
-                                        .show();
-                                return;
-                            }
-
-                            handleContactResult(contactUri);
-
-                        }
-                    });
-
-    public interface OnEditShareListener {
-        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                               boolean isExpiryDateShown);
-
-        void onShareProcessClosed();
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java b/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
deleted file mode 100644
index 62eb8661a..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/SyncOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package it.niedermann.owncloud.notes.share;
-
-
-import android.content.Context;
-import android.os.Handler;
-
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.User;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-
-import androidx.annotation.NonNull;
-
-public abstract class SyncOperation extends RemoteOperation {
-    private final User user;
-
-    public SyncOperation(@NonNull User user) {
-        this.user = user;
-    }
-
-    public RemoteOperationResult execute(Context context) {
-        return super.execute(user, context);
-    }
-
-    public RemoteOperationResult execute(@NonNull NextcloudClient client) {
-        return run(client);
-    }
-
-    public Thread execute(OwnCloudClient client,
-                          OnRemoteOperationListener listener,
-                          Handler listenerHandler) {
-        return super.execute(client, listener, listenerHandler);
-    }
-
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
deleted file mode 100644
index be773c7f7..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/server/Server.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.server
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
-import java.net.URI
-
-/**
- * This object provides all information necessary to interact
- * with backend server.
- */
-data class Server(val uri: URI, val version: OwnCloudVersion) : Parcelable {
-
-    constructor(source: Parcel) : this(
-        source.readSerializable() as URI,
-        source.readParcelable<Parcelable>(OwnCloudVersion::class.java.classLoader) as OwnCloudVersion
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-        writeSerializable(uri)
-        writeParcelable(version, 0)
-    }
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<Server> = object : Parcelable.Creator<Server> {
-            override fun createFromParcel(source: Parcel): Server = Server(source)
-            override fun newArray(size: Int): Array<Server?> = arrayOfNulls(size)
-        }
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
deleted file mode 100644
index b68c4598d..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/user/User.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package it.niedermann.owncloud.notes.shared.user
-
-import android.accounts.Account
-import android.os.Parcelable
-import com.owncloud.android.lib.common.OwnCloudAccount
-import it.niedermann.owncloud.notes.shared.server.Server
-
-interface User : Parcelable, com.nextcloud.common.User {
-    override val accountName: String
-    val server: Server
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy platform Account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return Account instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    override fun toPlatformAccount(): Account
-
-    /**
-     * This is temporary helper method created to facilitate incremental refactoring.
-     * Code using legacy ownCloud account can be partially converted to instantiate User
-     * object and use account instance when required.
-     *
-     * This method calls will allow tracing code awaiting further refactoring.
-     *
-     * @return OwnCloudAccount instance that is associated with this User object.
-     */
-    @Deprecated("Temporary workaround")
-    fun toOwnCloudAccount(): OwnCloudAccount
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(user: User?): Boolean
-
-    /**
-     * Compare account names, case insensitive.
-     *
-     * @return true if account names are same, false otherwise
-     */
-    fun nameEquals(accountName: CharSequence?): Boolean
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
deleted file mode 100644
index cb6c5e14f..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ClipboardUtil.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-
-package it.niedermann.owncloud.notes.shared.util
-
-import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.text.TextUtils
-import android.widget.Toast
-import com.owncloud.android.lib.common.utils.Log_OC
-import it.niedermann.owncloud.notes.R
-
-/**
- * Helper implementation to copy a string into the system clipboard.
- */
-object ClipboardUtil {
-    private val TAG = ClipboardUtil::class.java.name
-
-    @JvmStatic
-    @JvmOverloads
-    @Suppress("TooGenericExceptionCaught")
-    fun copyToClipboard(activity: Activity, text: String?, showToast: Boolean = true) {
-        if (!TextUtils.isEmpty(text)) {
-            try {
-                val clip = ClipData.newPlainText(
-                    activity.getString(
-                        R.string.clipboard_label,
-                        activity.getString(R.string.app_name)
-                    ),
-                    text
-                )
-                (activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(clip)
-                if (showToast) {
-                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show()
-                }
-            } catch (e: Exception) {
-                Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show()
-                Log_OC.e(TAG, "Exception caught while copying to clipboard", e)
-            }
-        } else {
-            Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show()
-        }
-    }
-}
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index 8d6e4d150..ffb8e2e6c 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/spacer_2x"
-        android:contentDescription="@string/note_share_fragment_activity_icon_content_description" />
+        android:contentDescription="@string/note_share_activity_activity_icon_content_description" />
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d238f50a..bde9526c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,36 +38,62 @@
 
     <string name="change_category_title">Choose a category</string>
 
-    <string-array name="folder_share_permission_dialog_values" translatable="false">
+    <!-- UsersAndGroupsSearchProvider -->
+    <string name="users_and_groups_search_provider_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_search_provider_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+
+    <!-- QuickSharingPermissionsBottomSheetDialog -->
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_folder_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_allow_upload_and_editing</item>
         <item>@string/link_share_file_drop</item>
     </string-array>
-    <string-array name="file_share_permission_dialog_values" translatable="false">
+    <string-array name="quick_sharing_permission_bottom_sheet_dialog_note_share_values" translatable="false">
         <item>@string/link_share_view_only</item>
         <item>@string/link_share_editing</item>
     </string-array>
-    <string name="note_share_fragment_activity_icon_content_description">note activity icon</string>
-    <string name="note_share_fragment_share_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_external_icon_content_description">note share external icon</string>
-    <string name="note_share_fragment_copy_icon_content_description">note share copy icon</string>
-    <string name="note_share_fragment_more_icon_content_description">note share more icon</string>
-    <string name="note_share_fragment_icon_content_description">note share icon</string>
-    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>
-    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>
-    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>
-    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>
-    <string name="note_share_fragment_share_link">Share link</string>
-    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>
-    <string name="note_share_fragment_could_not_retrieve_url">Could not retrieve URL</string>
-    <string name="note_share_fragment_subject_shared_with_you">\"%1$s\" has been shared with you</string>
-    <string name="contact_no_permission">Contact permission is required.</string>
-    <string name="share_link_empty_password">You must enter a password</string>
-    <string name="hint_password">Password</string>
-    <string name="share_link_optional_password_title">Enter an optional password</string>
-    <string name="common_skip">Skip</string>
-    <string name="common_cancel">Cancel</string>
-    <string name="empty" translatable="false" />
+
+    <!-- NoteShareActivity -->
+    <string name="note_share_activity_activity_icon_content_description">note activity icon</string>
+    <string name="note_share_activity_share_icon_content_description">note share icon</string>
+    <string name="note_share_activity_external_icon_content_description">note share external icon</string>
+    <string name="note_share_activity_copy_icon_content_description">note share copy icon</string>
+    <string name="note_share_activity_more_icon_content_description">note share more icon</string>
+    <string name="note_share_activity_icon_content_description">note share icon</string>
+    <string name="note_share_activity_user_icon_content_description">note share user icon</string>
+    <string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
+    <string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
+    <string name="note_share_activity_share_note">Share note</string>
+    <string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
+    <string name="note_share_activity_share_link">Share link</string>
+    <string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>
+    <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
+    <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
+    <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
+
+    <!-- NoteShareDetailActivity -->
+    <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
+    <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
+    <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
+    <string name="note_share_detail_activity_hint_note">Note</string>
+    <string name="note_share_detail_activity_common_next">Next</string>
+    <string name="note_share_detail_activity_share_copy_link">Share and Copy Link</string>
+    <string name="note_share_detail_activity_common_confirm">Confirm</string>
+    <string name="note_share_detail_activity_set_note">Set Note</string>
+    <string name="note_share_detail_activity_send_share">Send Share</string>
+    <string name="note_share_detail_activity_hint_name">Name</string>
+    <string name="note_share_detail_activity_link_name">Link Name</string>
+    <string name="note_share_detail_activity_share_link_empty_password">You must enter a password</string>
+    <string name="note_share_detail_activity_hint_password">Password</string>
+    <string name="note_share_detail_activity_no_share_permission_selected">Please select at least one permission to share.</string>
+    <string name="note_share_detail_activity_label_empty">Label cannot be empty</string>
+    <string name="note_share_detail_activity_cancel">Cancel</string>
+    <string name="note_share_detail_activity_create_share_error">Failed to create a share</string>
+
+    <!-- SharePasswordDialogFragment -->
+    <string name="share_password_dialog_fragment_share_link_optional_password_title">Enter an optional password</string>
+    <string name="share_password_dialog_fragment_skip">Skip</string>
+
     <string name="share_link_password_title">Enter a password</string>
     <string name="common_ok">OK</string>
     <string name="common_delete">Delete</string>
@@ -76,6 +102,7 @@
     <string name="no_email_app_available">No App available to handle mail address</string>
     <string name="no_actions">No actions for this user</string>
 
+    <string name="failed_the_remove_share">Failed to remove share</string>
     <string name="email_pick_failed">Failed to pick email address.</string>
     <string name="failed_update_ui">Failed to update UI</string>
     <string name="file_detail_sharing_fragment_no_contact_app_message">No app available to select contacts</string>
@@ -124,6 +151,9 @@
     <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_room_clarification">%1$s (conversation)</string>
     <string name="share_known_remote_on_clarification">on %1$s</string>
+    <string name="remote">(remote)</string>
+
+    <string name="empty" translatable="false" />
 
     <string name="copy_link">Copy link</string>
     <string name="share">Share</string>

From 097a1c25192cbfb173b5dbe7be9b734ad46241fb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 14 Feb 2025 10:36:53 +0100
Subject: [PATCH 101/138] remove note

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../persistence/sync/CapabilitiesDeserializer.java | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index 7cc6679d2..a382d18f4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -43,20 +43,6 @@ public class CapabilitiesDeserializer implements JsonDeserializer<Capabilities>
     private static final String CAPABILITIES_FILES_SHARING = "files_sharing";
     private static final String VERSION = "version";
 
-    /*
-    if (capabilities != null && (capabilities.getFilesSharingPublicPasswordEnforced().isTrue() ||
-            capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue())) {
-            // password enforced by server, request to the user before trying to create
-            requestPasswordForShareViaLink(true,
-                                           capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
-
-        } else {
-            // create without password if not enforced by server or we don't know if enforced;
-            fileOperationsHelper.shareFileViaPublicShare(file, null);
-        }
-
-        password -> {JsonObject@32644} "{"enforced":false,"askForOptionalPassword":false}"
-     */
     @Override
     public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         final var response = new Capabilities();

From bd3ef72f6877398014431db2bf23103c8633d7f6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 17 Feb 2025 17:02:28 +0100
Subject: [PATCH 102/138] check resharing

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/edit/BaseNoteFragment.java |  2 +-
 .../owncloud/notes/edit/EditNoteActivity.java |  2 +-
 .../notes/persistence/NotesRepository.java    |  8 +--
 .../notes/persistence/dao/NoteDao.java        | 18 +++----
 .../notes/persistence/entity/Note.java        | 19 +++++--
 .../sync/CapabilitiesDeserializer.java        |  2 +
 .../notes/share/NoteShareActivity.java        | 51 ++++++++++++++-----
 .../notes/shared/model/Capabilities.java      |  9 ++++
 8 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index fbbf86c2a..903bce104 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -122,7 +122,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                             if (content == null) {
                                 throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing.");
                             } else {
-                                note = new Note(-1, null, Calendar.getInstance(), NoteUtil.generateNoteTitle(content), content, getString(R.string.category_readonly), false, null, DBStatus.VOID, -1, "", 0, false);
+                                note = new Note(-1, null, Calendar.getInstance(), NoteUtil.generateNoteTitle(content), content, getString(R.string.category_readonly), false, null, DBStatus.VOID, -1, "", 0, false, false);
                                 requireActivity().runOnUiThread(() -> onNoteLoaded(note));
                                 requireActivity().invalidateOptionsMenu();
                             }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index 345b278d7..ee24c2820 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -302,7 +302,7 @@ private void launchNewNote() {
         if (content == null) {
             content = "";
         }
-        final var newNote = new Note(null, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, categoryTitle, favorite, null, false);
+        final var newNote = new Note(null, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, categoryTitle, favorite, null, false, false);
         fragment = getNewNoteFragment(newNote);
         replaceFragment();
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index fa9eb594d..cffa91561 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -480,7 +480,7 @@ public NotesListWidgetData getNoteListWidgetData(int appWidgetId) {
     @NonNull
     @MainThread
     public LiveData<Note> addNoteAndSync(Account account, Note note) {
-        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0, note.isShared());
+        final var entity = new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, account.getId(), generateNoteExcerpt(note.getContent(), note.getTitle()), 0, note.isShared(), note.getReadonly());
         final var ret = new MutableLiveData<Note>();
         executor.submit(() -> ret.postValue(addNote(account.getId(), entity)));
         return map(ret, newNote -> {
@@ -508,7 +508,7 @@ public Note addNote(long accountId, @NonNull Note note) {
 
     @MainThread
     public LiveData<Note> moveNoteToAnotherAccount(Account account, @NonNull Note note) {
-        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null, note.isShared());
+        final var fullNote = new Note(null, note.getModified(), note.getTitle(), note.getContent(), note.getCategory(), note.getFavorite(), null, note.isShared(), note.getReadonly());
         fullNote.setStatus(DBStatus.LOCAL_EDITED);
         deleteNoteAndSync(account, note.getId());
         return addNoteAndSync(account, fullNote);
@@ -570,7 +570,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
         // https://github.com/nextcloud/notes-android/issues/1198
         @Nullable final Long remoteId = db.getNoteDao().getRemoteId(oldNote.getId());
         if (newContent == null) {
-            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY(), oldNote.isShared());
+            newNote = new Note(oldNote.getId(), remoteId, oldNote.getModified(), oldNote.getTitle(), oldNote.getContent(), oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), oldNote.getExcerpt(), oldNote.getScrollY(), oldNote.isShared(), oldNote.getReadonly());
         } else {
             final String title;
             if (newTitle != null) {
@@ -584,7 +584,7 @@ public Note updateNoteAndSync(@NonNull Account localAccount, @NonNull Note oldNo
                     title = oldNote.getTitle();
                 }
             }
-            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY(), oldNote.isShared());
+            newNote = new Note(oldNote.getId(), remoteId, Calendar.getInstance(), title, newContent, oldNote.getCategory(), oldNote.getFavorite(), oldNote.getETag(), DBStatus.LOCAL_EDITED, localAccount.getId(), generateNoteExcerpt(newContent, title), oldNote.getScrollY(), oldNote.isShared(), oldNote.getReadonly());
         }
         int rows = db.getNoteDao().updateNote(newNote);
         // if data was changed, set new status and schedule sync (with callback); otherwise invoke callback directly.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
index 2f04c77e9..6c1b48634 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
@@ -38,14 +38,14 @@ public interface NoteDao {
     String getNoteById = "SELECT * FROM NOTE WHERE id = :id";
     String count = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId";
     String countFavorites = "SELECT COUNT(*) FROM NOTE WHERE status != 'LOCAL_DELETED' AND accountId = :accountId AND favorite = 1";
-    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
-    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
-    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
-    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
-    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
-    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
-    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchRecentByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, modified DESC";
+    String searchRecentLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchFavoritesByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY modified DESC";
+    String searchFavoritesLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND favorite = 1 ORDER BY title COLLATE LOCALIZED ASC";
+    String searchUncategorizedByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, modified DESC";
+    String searchUncategorizedLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND category = '' ORDER BY favorite DESC, title COLLATE LOCALIZED ASC";
+    String searchCategoryByModified = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, modified DESC";
+    String searchCategoryLexicographically = "SELECT id, remoteId, accountId, title, favorite, isShared, readonly, excerpt, modified, category, status, '' as eTag, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE :query OR content LIKE :query) AND (category = :category OR category LIKE :category || '/%') ORDER BY category, favorite DESC, title COLLATE LOCALIZED ASC";
 
     @Query(getNoteById)
     LiveData<Note> getNoteById$(long id);
@@ -141,7 +141,7 @@ public interface NoteDao {
      * Gets a list of {@link Note} objects with filled {@link Note#id} and {@link Note#remoteId},
      * where {@link Note#remoteId} is not <code>null</code>
      */
-    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, 0 as isShared, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
+    @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, 0 as isShared, 0 as readonly, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY  FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND remoteId IS NOT NULL")
     List<Note> getRemoteIdAndId(long accountId);
 
     /**
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
index 84756ebbc..010493abf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
@@ -39,6 +39,7 @@
                 @Index(name = "IDX_NOTE_CATEGORY", value = "category"),
                 @Index(name = "IDX_NOTE_FAVORITE", value = "favorite"),
                 @Index(name = "IDX_NOTE_IS_SHARED", value = "isShared"),
+                @Index(name = "IDX_READONLY", value = "readonly"),
                 @Index(name = "IDX_NOTE_MODIFIED", value = "modified"),
                 @Index(name = "IDX_NOTE_REMOTEID", value = "remoteId"),
                 @Index(name = "IDX_NOTE_STATUS", value = "status")
@@ -86,6 +87,10 @@ public class Note implements Serializable, Item {
     @ColumnInfo(defaultValue = "0")
     private boolean isShared = false;
 
+    @Expose
+    @ColumnInfo(defaultValue = "0")
+    private boolean readonly = false;
+
     @Expose
     @Nullable
     @SerializedName("etag")
@@ -103,7 +108,7 @@ public Note() {
     }
 
     @Ignore
-    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isShared) {
+    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isShared, boolean readonly) {
         this.remoteId = remoteId;
         this.title = title;
         this.modified = modified;
@@ -115,8 +120,8 @@ public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull Strin
     }
 
     @Ignore
-    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isShared) {
-        this(remoteId, modified, title, content, category, favorite, etag, isShared);
+    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isShared, boolean readonly) {
+        this(remoteId, modified, title, content, category, favorite, etag, isShared, readonly);
         this.id = id;
         this.status = status;
         this.accountId = accountId;
@@ -202,6 +207,14 @@ public void setContent(@NonNull String content) {
         this.content = content;
     }
 
+    public boolean getReadonly() {
+        return readonly;
+    }
+
+    public void setReadonly(boolean value) {
+       readonly = value;
+    }
+
     public boolean getFavorite() {
         return favorite;
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index a382d18f4..42efdcb18 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -74,9 +74,11 @@ public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializat
                 final var password = publicObject.getAsJsonObject("password");
                 final var enforced = password.getAsJsonPrimitive("enforced");
                 final var askForOptionalPassword = password.getAsJsonPrimitive("askForOptionalPassword");
+                final var isReSharingAllowed = filesSharing.getAsJsonPrimitive("resharing");
 
                 response.setPublicPasswordEnforced(enforced.getAsBoolean());
                 response.setAskForOptionalPassword(askForOptionalPassword.getAsBoolean());
+                response.setReSharingAllowed(isReSharingAllowed.getAsBoolean());
             }
 
             if (capabilities.has(CAPABILITIES_NOTES)) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 96bbf1c9a..706bfac77 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -14,6 +14,7 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -114,7 +115,12 @@ private void initializeArguments() {
                     binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
                     binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));
 
-                    setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
+                    if (note.getReadonly()) {
+                        setupReadOnlySearchView();
+                    } else {
+                        setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
+                    }
+
                     refreshCapabilitiesFromDB();
                     refreshSharesFromDB();
                 });
@@ -136,6 +142,24 @@ public void onStop() {
         UsersAndGroupsSearchConfig.INSTANCE.reset();
     }
 
+    private void disableSearchView(View view) {
+        view.setEnabled(false);
+
+        if (view instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                disableSearchView(viewGroup.getChildAt(i));
+            }
+        }
+    }
+
+    private void setupReadOnlySearchView() {
+        binding.searchView.setIconifiedByDefault(false);
+        binding.searchView.setQueryHint(getResources().getString(R.string.note_share_activity_resharing_not_allowed));
+        binding.searchView.setInputType(InputType.TYPE_NULL);
+        binding.pickContactEmailBtn.setVisibility(View.GONE);
+        disableSearchView(binding.searchView);
+    }
+
     private void setupSearchView(@Nullable SearchManager searchManager, ComponentName componentName) {
         if (searchManager == null) {
             binding.searchView.setVisibility(View.GONE);
@@ -182,24 +206,26 @@ public boolean onQueryTextChange(String newText) {
                     }
 
                     final var isFederationShareAllowed = capabilities.getFederationShare();
-                    try(var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed)) {
-                        runOnUiThread(() -> {
-                            {
-                                if (cursor == null || cursor.getCount() == 0) {
-                                    return;
-                                }
+                    try {
+                        var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed);
 
-                                if (binding.searchView.getVisibility() == View.VISIBLE) {
-                                    suggestionAdapter.swapCursor(cursor);
-                                }
+                        if (cursor == null || cursor.getCount() == 0) {
+                            return;
+                        }
 
-                                binding.progressBar.setVisibility(View.GONE);
+                        runOnUiThread(() -> {
+                            if (binding.searchView.getVisibility() == View.VISIBLE) {
+                                suggestionAdapter.swapCursor(cursor);
                             }
+
+                            binding.progressBar.setVisibility(View.GONE);
                         });
+
                     } catch (Exception e) {
                         Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
                         runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
                     }
+
                 }, SEARCH_DELAY_MS, TimeUnit.MILLISECONDS);
 
                 return false;
@@ -500,7 +526,8 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return false;
+        return ShareType.FEDERATED == share.getShareType() ||
+                capabilities != null && !capabilities.isReSharingAllowed();
     }
 
     @VisibleForTesting
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index efb9e4918..b7a8aaed2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -41,6 +41,15 @@ public class Capabilities implements Serializable {
 
     private boolean publicPasswordEnforced;
     private boolean askForOptionalPassword;
+    private boolean isReSharingAllowed;
+
+    public boolean isReSharingAllowed() {
+        return isReSharingAllowed;
+    }
+
+    public void setReSharingAllowed(boolean value) {
+        this.isReSharingAllowed = value;
+    }
 
     public boolean getPublicPasswordEnforced() {
         return publicPasswordEnforced;

From 8f2bc70c6e7aca5e2092c18e216f7943085a96d4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 11:06:36 +0100
Subject: [PATCH 103/138] add getShareFromNote

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/sync/ShareAPI.kt        |  6 +++++
 .../notes/share/NoteShareActivity.java        | 24 +++++++++++++++----
 .../notes/share/repository/ShareRepository.kt | 24 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
index 03096439f..53e3c0449 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/ShareAPI.kt
@@ -57,4 +57,10 @@ interface ShareAPI {
         @Path("shareId") shareId: Long,
         @Body request: UpdateSharePermissionRequest
     ): Call<OcsResponse<CreateShareResponse>>
+
+    @GET("shares/?format=json")
+    fun getShareFromNote(
+        @Query("path") path: String,
+        @Query("shared_with_me") sharedWithMe: Boolean = true
+    ): Call<OcsResponse<List<CreateShareResponse>>>
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 706bfac77..743798ff3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -421,15 +421,20 @@ public void refreshSharesFromDB() {
 
                 // to show share with users/groups info
                 if (note != null) {
+
+                    // get shares from local DB
                     final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
                         if (entity.getId() != null) {
-                            final var share = repository.getShares(entity.getId());
-                            if (share != null) {
-                                shares.addAll(share);
-                            }
+                            addShares(entity.getId());
                         }
                     });
+
+                    // get shares from remote
+                    final var shares = repository.getShareFromNote(note);
+                    if (shares != null) {
+                        shares.forEach(entity -> addShares(entity.getId()));
+                    }
                 }
 
                 runOnUiThread(() -> {
@@ -443,6 +448,17 @@ public void refreshSharesFromDB() {
         });
     }
 
+    private void addShares(long id) {
+        final var result = repository.getShares(id);
+        if (result != null) {
+            result.forEach(ocShare -> {
+                if (!shares.contains(ocShare)) {
+                    shares.add(ocShare);
+                }
+            });
+        }
+    }
+
     private void addPublicShares(ShareeListAdapter adapter) {
         List<OCShare> publicShares = new ArrayList<>();
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index f62652193..2a11d0f87 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -38,7 +38,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         return notesPathResponse.body()
     }
 
-    fun getNotePath(note: Note): String? {
+    private fun getNotePath(note: Note): String? {
         val notesPathResponseResult = getNotesPathResponseResult() ?: return null
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
@@ -194,6 +194,28 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun getShareFromNote(note: Note): List<OCShare>? {
+        val shareAPI = apiProvider.getShareAPI(applicationContext, account)
+        val path = getNotePath(note) ?: return null
+        val call = shareAPI.getShareFromNote(path)
+        val response = call.execute()
+
+        return try {
+            if (response.isSuccessful) {
+                val body = response.body()
+                Log_OC.d(tag, "Response successful: $body")
+                body?.ocs?.data?.toOCShare()
+            } else {
+                val errorBody = response.errorBody()?.string()
+                Log_OC.d(tag, "Response failed: $errorBody")
+                null
+            }
+        } catch (e: Exception) {
+            Log_OC.d(tag, "Exception while getting share from note: ", e)
+            null
+        }
+    }
+
     fun removeShare(share: OCShare, note: Note): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
 

From 5576e041a0fe6c9348457dad557e2eace25110d4 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 11:18:00 +0100
Subject: [PATCH 104/138] check public share permission

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java   | 5 +++++
 app/src/main/res/values/strings.xml                          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 743798ff3..5b9fa814c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -329,6 +329,11 @@ public void createPublicShareLink() {
                     note.setIsShared(true);
                     repository.updateNote(note);
                     runOnUiThread(this::recreate);
+                } else {
+                    runOnUiThread(() -> {
+                        final var message = getString(R.string.note_share_activity_you_are_not_allowed_to_share);
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
+                    });
                 }
             });
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bde9526c0..678c318c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,6 +70,7 @@
     <string name="note_share_activity_could_not_retrieve_url">Could not retrieve URL</string>
     <string name="note_share_activity_subject_shared_with_you">\"%1$s\" has been shared with you</string>
     <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
+    <string name="note_share_activity_you_are_not_allowed_to_share">You are not allowed to create a public share.</string>
 
     <!-- NoteShareDetailActivity -->
     <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>

From a67fbd7e04b8f167bc69024eed85ab6a66b84746 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 11:29:08 +0100
Subject: [PATCH 105/138] merge master

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 gradle/verification-metadata.xml | 72 +++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c51e09c98..d2c20743c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -7,6 +7,9 @@
          <trust group="com.android.tools.build" name="aapt2" version="8.8.1-12006047" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
       </trusted-artifacts>
+      <ignored-keys>
+         <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
+      </ignored-keys>
       <trusted-keys>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
             <trusting group="org.glassfish.jaxb"/>
@@ -149,7 +152,10 @@
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD" group="io.grpc"/>
-         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314" group="org.apache.commons" name="commons-parent" version="52"/>
+         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
+            <trusting group="org.apache.commons"/>
+            <trusting group="org.apache.commons" name="commons-parent" version="52"/>
+         </trusted-key>
          <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
          <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
          <trusted-key id="BCC135FC7ED8214F823D73E97FE9900F412D622E" group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0"/>
@@ -5426,6 +5432,14 @@
             <sha256 value="ce28456d366507ca0f91022942a05e388fd98f862a6d8db3105c5c4497a74ce5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.bitfireAT" name="dav4jvm" version="2.2.1">
+         <artifact name="dav4jvm-2.2.1.jar">
+            <sha256 value="e6b8a9ff7ada0841198b18de2d6fd935f1f8754d3c84b8e8e3dc1840648d595d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="dav4jvm-2.2.1.module">
+            <sha256 value="977a16e0c70ee01139463fd4cbd9efd7d7a767c0c8b3e72941b69cbdd2f085d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.16.0">
          <artifact name="annotations-4.16.0.jar">
             <sha256 value="c59e39b1b31b4d5592277cd90012149d740b569d4338f56443cac82c3fbda3d1" origin="Generated by Gradle"/>
@@ -5545,6 +5559,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
          <artifact name="core-0.14.0.aar">
             <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6856,6 +6878,22 @@
             <sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.2">
+         <artifact name="commons-codec-1.2.jar">
+            <sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-codec-1.2.pom">
+            <sha256 value="28d6c089355487fd2e973e091a152727ac27ad2b2c1ec9cbcf916a10fc863148" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="commons-httpclient" name="commons-httpclient" version="3.1">
+         <artifact name="commons-httpclient-3.1.jar">
+            <pgp value="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5"/>
+         </artifact>
+         <artifact name="commons-httpclient-3.1.pom">
+            <sha256 value="8a9b07d458d3e730221dbecdfafa7353ec1babd3b94c843227c47104a90c6d6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.13.0">
          <artifact name="commons-io-2.13.0.jar">
             <sha256 value="671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" origin="Generated by Gradle"/>
@@ -7315,6 +7353,11 @@
             <sha256 value="31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="10">
+         <artifact name="apache-10.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="13">
          <artifact name="apache-13.pom">
             <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
@@ -7456,6 +7499,19 @@
             <sha256 value="dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
+         <artifact name="jackrabbit-parent-2.13.5.pom">
+            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
+         <artifact name="jackrabbit-webdav-2.13.5.jar">
+            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="jackrabbit-webdav-2.13.5.pom">
+            <pgp value="44F4797A52C336FA666CD9271DE461528F1F1B2A"/>
+         </artifact>
+      </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
          <artifact name="jose4j-0.9.5.jar">
             <sha256 value="808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" origin="Generated by Gradle"/>
@@ -8929,5 +8985,19 @@
             <sha256 value="138ebb33cce7080fd5cdb4fb90a0ee550173d7e8d41024da8c0d788b1460a1f3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+
+      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
+         <artifact name="jackrabbit-parent-2.13.5.pom">
+            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
+         <artifact name="jackrabbit-webdav-2.13.5.jar">
+            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="jackrabbit-webdav-2.13.5.pom">
+            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
    </components>
 </verification-metadata>

From 7f8cbc729cccd21c9a01432a519eba0ead9347c9 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 11:31:02 +0100
Subject: [PATCH 106/138] remove unused functions and add todos

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareActivity.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 5b9fa814c..52c50c56a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -121,7 +121,6 @@ private void initializeArguments() {
                         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
                     }
 
-                    refreshCapabilitiesFromDB();
                     refreshSharesFromDB();
                 });
             } catch (Exception e) {
@@ -344,6 +343,7 @@ public void requestPasswordForShareViaLink(boolean createShare, boolean askForPa
         dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
+    // TODO:
     @Override
     public void createSecureFileDrop() {
 
@@ -405,13 +405,11 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
         dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
+    // TODO:
     @Override
     public void showProfileBottomSheet(Account account, String shareWith) {
     }
 
-    public void refreshCapabilitiesFromDB() {
-    }
-
     public void refreshSharesFromDB() {
         executorService.submit(() -> {
             try {
@@ -588,6 +586,7 @@ public void unShare(OCShare share) {
         });
     }
 
+    // TODO:
     @Override
     public void sendLink(OCShare share) {
     }

From 01df2e3f62ffa0a76e75d9d60b10e47cbecb9a87 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 17:00:37 +0100
Subject: [PATCH 107/138] fail fast handleContactResult

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 52c50c56a..e90eb923e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -499,32 +499,35 @@ private void handleContactResult(@NonNull Uri contactUri) {
         String[] projection = {ContactsContract.CommonDataKinds.Email.ADDRESS};
 
         Cursor cursor = getContentResolver().query(contactUri, projection, null, null, null);
+        if (cursor == null) {
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+            Log_OC.e(TAG, "Failed to pick email address as Cursor is null.");
+            return;
+        }
 
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                // The contact has only one email address, use it.
-                int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
-                if (columnIndex != -1) {
-                    // Use the email address as needed.
-                    // email variable contains the selected contact's email address.
-                    String email = cursor.getString(columnIndex);
-                    binding.searchView.post(() -> {
-                        binding.searchView.setQuery(email, false);
-                        binding.searchView.requestFocus();
-                    });
-                } else {
-                    DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-                    Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address.");
-                }
-            } else {
-                DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-                Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as no Email found.");
-            }
-            cursor.close();
-        } else {
+        if (!cursor.moveToFirst()) {
             DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
-            Log_OC.e(NoteShareActivity.class.getSimpleName(), "Failed to pick email address as Cursor is null.");
+            Log_OC.e(TAG, "Failed to pick email address as no Email found.");
+            return;
+        }
+
+        // The contact has only one email address, use it.
+        int columnIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
+        if (columnIndex == -1) {
+            DisplayUtils.showSnackMessage(this, getString(R.string.email_pick_failed));
+            Log_OC.e(TAG, "Failed to pick email address.");
+            return;
         }
+
+        // Use the email address as needed.
+        // email variable contains the selected contact's email address.
+        String email = cursor.getString(columnIndex);
+        binding.searchView.post(() -> {
+            binding.searchView.setQuery(email, false);
+            binding.searchView.requestFocus();
+        });
+
+        cursor.close();
     }
 
     private boolean containsNoNewPublicShare(List<OCShare> shares) {

From 1a007505a0c0b757ca89a53f216ebedd50e0d96d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 18 Feb 2025 17:01:10 +0100
Subject: [PATCH 108/138] add FIXME

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e90eb923e..b32ab8a40 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -487,6 +487,7 @@ private void checkContactPermission() {
     private void pickContactEmail() {
         Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
 
+        // FIXME:
         if (intent.resolveActivity(getPackageManager()) != null) {
             onContactSelectionResultLauncher.launch(intent);
         } else {

From 0c75ba5ae20c5ee14fcc73b71ed1fec9b296e110 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 19 Feb 2025 10:54:44 +0100
Subject: [PATCH 109/138] fix crashes

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/persistence/NotesRepository.java       | 12 ++++++++++--
 .../notes/share/adapter/ShareeListAdapter.java   | 16 +++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index cffa91561..7e00aec15 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -15,6 +15,7 @@
 import static it.niedermann.owncloud.notes.shared.util.NoteUtil.generateNoteExcerpt;
 import static it.niedermann.owncloud.notes.widget.notelist.NoteListWidget.updateNoteListWidgets;
 import static it.niedermann.owncloud.notes.widget.singlenote.SingleNoteWidget.updateSingleNoteWidgets;
+
 import android.accounts.NetworkErrorException;
 import android.content.Context;
 import android.content.Intent;
@@ -25,8 +26,11 @@
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
+
 import androidx.annotation.AnyThread;
 import androidx.annotation.ColorInt;
 import androidx.annotation.MainThread;
@@ -37,11 +41,13 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
+
 import com.nextcloud.android.sso.AccountImporter;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -51,6 +57,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+
 import it.niedermann.android.sharedpreferences.SharedPreferenceIntLiveData;
 import it.niedermann.owncloud.notes.BuildConfig;
 import it.niedermann.owncloud.notes.R;
@@ -100,6 +107,7 @@ public class NotesRepository {
     private boolean syncOnlyOnWifi;
     private final MutableLiveData<Boolean> syncStatus = new MutableLiveData<>(false);
     private final MutableLiveData<ArrayList<Throwable>> syncErrors = new MutableLiveData<>();
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
 
     private final Observer<? super ConnectionLiveData.ConnectionType> syncObserver = (Observer<ConnectionLiveData.ConnectionType>) connectionType -> {
         observeNetworkStatus(connectionType);
@@ -158,7 +166,7 @@ private NotesRepository(@NonNull final Context context, @NonNull final NotesData
         this.syncOnlyOnWifiKey = context.getApplicationContext().getResources().getString(R.string.pref_key_wifi_only);
         this.connectionLiveData = new ConnectionLiveData(context);
 
-        connectionLiveData.observeForever(syncObserver);
+        mainHandler.post(() -> connectionLiveData.observeForever(syncObserver));
 
         final var prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
         prefs.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener);
@@ -218,7 +226,7 @@ private void handleNetworkStatus(boolean isWifiActive) {
 
     @Override
     protected void finalize() throws Throwable {
-        connectionLiveData.removeObserver(syncObserver);
+        mainHandler.post(() -> connectionLiveData.removeObserver(syncObserver));
         super.finalize();
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 157a61be5..893d1bb29 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -49,7 +49,21 @@ public ShareeListAdapter(Activity activity,
 
     @Override
     public int getItemViewType(int position) {
-        return shares.get(position).getShareType().getValue();
+        if (position < 0 || position >= shares.size()) {
+            return 0;
+        }
+
+        final var share = shares.get(position);
+        if (share == null) {
+            return 0;
+        }
+
+        final var shareType = share.getShareType();
+        if (shareType == null) {
+            return 0;
+        }
+
+        return shareType.getValue();
     }
 
     @NonNull

From 4898e0999d6520dff42253e51938281d7c94a29f Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 19 Feb 2025 10:58:40 +0100
Subject: [PATCH 110/138] fix crashes

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index b32ab8a40..5a78aa284 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -72,7 +72,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     public static final String ARG_ACCOUNT = "ACCOUNT";
     public static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
-    private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+    private ScheduledExecutorService executorService;
     private Future<?> future;
     private static final long SEARCH_DELAY_MS = 500;
 
@@ -86,6 +86,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        executorService = Executors.newSingleThreadScheduledExecutor();
         binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         initializeArguments();

From 2adf41fe84863b89b08579be96e5532db7099b03 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 19 Feb 2025 13:04:05 +0100
Subject: [PATCH 111/138] check shareType

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java     |  4 ++--
 .../notes/share/adapter/ShareeListAdapter.java      | 10 ++++++----
 .../share/adapter/holder/LinkShareViewHolder.java   |  2 +-
 .../notes/share/adapter/holder/ShareViewHolder.java | 13 +++++++++++--
 ...areActivityShareItemActionBottomSheetDialog.java |  2 +-
 .../notes/share/repository/ShareRepository.kt       |  2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 5a78aa284..99a811a84 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -534,7 +534,7 @@ private void handleContactResult(@NonNull Uri contactUri) {
 
     private boolean containsNoNewPublicShare(List<OCShare> shares) {
         for (OCShare share : shares) {
-            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
+            if (share.getShareType() != null && share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
                 return false;
             }
         }
@@ -550,7 +550,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private boolean isReshareForbidden(OCShare share) {
-        return ShareType.FEDERATED == share.getShareType() ||
+        return (share.getShareType() != null && ShareType.FEDERATED == share.getShareType()) ||
                 capabilities != null && !capabilities.isReSharingAllowed();
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 893d1bb29..022aec57a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -150,10 +150,12 @@ protected final void sortShares() {
         List<OCShare> users = new ArrayList<>();
 
         for (OCShare share : shares) {
-            if (ShareType.PUBLIC_LINK == share.getShareType() || ShareType.EMAIL == share.getShareType()) {
-                links.add(share);
-            } else if (share.getShareType() != ShareType.INTERNAL) {
-                users.add(share);
+            if (share.getShareType()  != null) {
+                if (ShareType.PUBLIC_LINK == share.getShareType() || ShareType.EMAIL == share.getShareType()) {
+                    links.add(share);
+                } else if (share.getShareType() != ShareType.INTERNAL) {
+                    users.add(share);
+                }
             }
         }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
index f3a5e1c6e..0f6bb3864 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java
@@ -35,7 +35,7 @@ public LinkShareViewHolder(ItemShareLinkShareBinding binding, Context context) {
     }
 
     public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
-        if (ShareType.EMAIL == publicShare.getShareType()) {
+        if (publicShare.getShareType() != null && ShareType.EMAIL == publicShare.getShareType()) {
             binding.name.setText(publicShare.getSharedWithDisplayName());
             binding.icon.setImageDrawable(ResourcesCompat.getDrawable(context.getResources(),
                     R.drawable.ic_email,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 8c7a60692..0ebf0dbd0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -42,8 +42,12 @@ public void bind(OCShare share,
         String accountName = account.getDisplayName();
         String name = share.getSharedWithDisplayName();
         binding.icon.setTag(null);
+        final var shareType = share.getShareType();
+        if (shareType == null) {
+            return;
+        }
 
-        switch (share.getShareType()) {
+        switch (shareType) {
             case GROUP:
                 name = context.getString(R.string.share_group_clarification, name);
                 // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
@@ -74,6 +78,11 @@ public void bind(OCShare share,
 
         binding.name.setText(name);
 
+        if (accountName == null) {
+            binding.overflowMenu.setVisibility(View.GONE);
+            return;
+        }
+
         if (accountName.equalsIgnoreCase(share.getShareWith()) || accountName.equalsIgnoreCase(share.getUserId())) {
             binding.overflowMenu.setVisibility(View.VISIBLE);
 
@@ -99,7 +108,7 @@ private void setPermissionName(String permissionName) {
 
     private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
         try {
-            // avatar.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadiusDimension));
+            AvatarLoader.INSTANCE.load(context, avatar, account);
         } catch (StringIndexOutOfBoundsException e) {
             avatar.setImageResource(fallback);
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
index 5bb6d3563..82340bd4a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/NoteShareActivityShareItemActionBottomSheetDialog.java
@@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void updateUI() {
-        if (ocShare.getShareType() == ShareType.PUBLIC_LINK) {
+        if (ocShare.getShareType() != null && ocShare.getShareType() == ShareType.PUBLIC_LINK) {
             binding.menuShareAddAnotherLink.setVisibility(View.VISIBLE);
             binding.menuShareSendLink.setVisibility(View.VISIBLE);
         } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 2a11d0f87..1944c8840 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -224,7 +224,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val response = call.execute()
             if (response.isSuccessful) {
 
-                if (share.shareType == ShareType.PUBLIC_LINK) {
+                if (share.shareType != null && share.shareType == ShareType.PUBLIC_LINK) {
                     note.setIsShared(false)
                     updateNote(note)
                 }

From ca134d9778200dc019f60666aea533f881d3ba52 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 19 Feb 2025 13:13:53 +0100
Subject: [PATCH 112/138] add loading layout

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        |  3 ++
 .../main/res/layout/activity_note_share.xml   | 32 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 99a811a84..9f4d0f9ba 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -111,6 +111,8 @@ private void initializeArguments() {
                 repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
+                    binding.searchContainer.setVisibility(View.VISIBLE);
+                    binding.sharesList.setVisibility(View.VISIBLE);
                     binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));
                     binding.sharesList.setLayoutManager(new LinearLayoutManager(this));
                     binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
@@ -123,6 +125,7 @@ private void initializeArguments() {
                     }
 
                     refreshSharesFromDB();
+                    binding.loadingLayout.setVisibility(View.GONE);
                 });
             } catch (Exception e) {
                 throw new RuntimeException(e);
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 6df68525c..ae4b8d5e0 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -15,8 +15,36 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/spacer_1hx">
 
+    <LinearLayout
+        android:id="@+id/loadingLayout"
+        tools:visibility="gone"
+        android:visibility="visible"
+        android:layout_width="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/spacer_1x"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_marginTop="@dimen/spacer_1x"
+            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:text="@string/common_loading"
+            android:textSize="@dimen/note_font_size_large" />
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/search_container"
+        tools:visibility="visible"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -81,6 +109,8 @@
         android:id="@+id/shared_with_you_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        tools:visibility="visible"
+        android:visibility="gone"
         android:layout_marginBottom="@dimen/spacer_1x"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/spacer_2x"
@@ -138,6 +168,8 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/sharesList"
+        tools:visibility="visible"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@drawable/divider"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 678c318c5..55b4c34d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,8 @@
     <string name="menu_favorite">Favorite</string>
     <string name="menu_preview">Preview</string>
     <string name="menu_share">Share</string>
+    <string name="common_loading">Loading…</string>
+
 
     <string name="search_in_category">Search in %1$s</string>
     <string name="search_in_all">Search all notes</string>

From 50c103dabd6799036c3ac2431b1c9f7074a6a5fe Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 19 Feb 2025 13:15:40 +0100
Subject: [PATCH 113/138] check shares

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/adapter/ShareeListAdapter.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 022aec57a..e764b22cf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -30,7 +30,7 @@
  */
 public class ShareeListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private Account account;
+    private final Account account;
     private final ShareeListAdapterListener listener;
     private final Activity activity;
     private List<OCShare> shares;
@@ -49,6 +49,10 @@ public ShareeListAdapter(Activity activity,
 
     @Override
     public int getItemViewType(int position) {
+        if (shares == null) {
+            return 0;
+        }
+
         if (position < 0 || position >= shares.size()) {
             return 0;
         }

From a0808aadd40a19b4ec031260b0aa91e923f470af Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 21 Feb 2025 16:10:54 +0100
Subject: [PATCH 114/138] add FilesSpecificViewThemeUtils

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../share/adapter/ShareeListAdapter.java      |  1 +
 .../share/adapter/holder/ShareViewHolder.java | 12 +--
 .../util/FilesSpecificViewThemeUtils.kt       | 78 +++++++++++++++++++
 app/src/main/res/drawable/first_run_talk.xml  | 18 +++++
 4 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/FilesSpecificViewThemeUtils.kt
 create mode 100644 app/src/main/res/drawable/first_run_talk.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index e764b22cf..5e0aa7934 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -111,6 +111,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
         final OCShare share = shares.get(position);
 
+
         if (holder instanceof LinkShareViewHolder publicShareViewHolder) {
             publicShareViewHolder.bind(share, listener);
         } else if (holder instanceof InternalShareViewHolder internalShareViewHolder) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 0ebf0dbd0..2eadeca6a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -18,6 +18,7 @@
 import it.niedermann.owncloud.notes.share.helper.AvatarLoader;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.shared.util.FilesSpecificViewThemeUtils;
 
 public class ShareViewHolder extends RecyclerView.ViewHolder {
     private ItemShareShareBinding binding;
@@ -37,8 +38,7 @@ public ShareViewHolder(ItemShareShareBinding binding,
         this.context = context;
     }
 
-    public void bind(OCShare share,
-                     ShareeListAdapterListener listener) {
+    public void bind(OCShare share, ShareeListAdapterListener listener) {
         String accountName = account.getDisplayName();
         String name = share.getSharedWithDisplayName();
         binding.icon.setTag(null);
@@ -47,17 +47,19 @@ public void bind(OCShare share,
             return;
         }
 
+        final var viewThemeUtils = FilesSpecificViewThemeUtils.INSTANCE;
+
         switch (shareType) {
             case GROUP:
                 name = context.getString(R.string.share_group_clarification, name);
-                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
                 break;
             case ROOM:
                 name = context.getString(R.string.share_room_clarification, name);
-                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
                 break;
             case CIRCLE:
-                // viewThemeUtils.files.createAvatar(share.getShareType(), binding.icon, context);
+                viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
                 break;
             case FEDERATED:
                 name = context.getString(R.string.share_remote_clarification, name);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/FilesSpecificViewThemeUtils.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/FilesSpecificViewThemeUtils.kt
new file mode 100644
index 000000000..82a0977d2
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/FilesSpecificViewThemeUtils.kt
@@ -0,0 +1,78 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package it.niedermann.owncloud.notes.shared.util
+
+import android.content.Context
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.annotation.Px
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandingUtil
+
+object FilesSpecificViewThemeUtils {
+
+    const val TAG = "FilesSpecificViewThemeUtils"
+
+    private object AvatarPadding {
+        @Px
+        const val SMALL = 4
+
+        @Px
+        const val LARGE = 8
+    }
+
+    fun createAvatar(type: ShareType?, avatar: ImageView, context: Context) {
+        fun createAvatarBase(@DrawableRes icon: Int, padding: Int = AvatarPadding.SMALL) {
+            avatar.setImageResource(icon)
+            avatar.background = ResourcesCompat.getDrawable(
+                context.resources,
+                R.drawable.round_bgnd,
+                null
+            )
+            avatar.cropToPadding = true
+            avatar.setPadding(padding, padding, padding, padding)
+        }
+
+        val androidViewThemeUtils = BrandingUtil.getInstance(context).platform
+
+        when (type) {
+            ShareType.GROUP -> {
+                createAvatarBase(R.drawable.ic_group)
+                androidViewThemeUtils.colorImageViewBackgroundAndIcon(avatar)
+            }
+            ShareType.ROOM -> {
+                createAvatarBase(R.drawable.first_run_talk, AvatarPadding.LARGE)
+                androidViewThemeUtils.colorImageViewBackgroundAndIcon(avatar)
+            }
+            ShareType.CIRCLE -> {
+                createAvatarBase(R.drawable.ic_circles)
+
+                val backgroundColor = ContextCompat.getColor(context, R.color.nc_grey)
+                avatar.background.colorFilter =
+                    BlendModeColorFilterCompat
+                        .createBlendModeColorFilterCompat(backgroundColor, BlendModeCompat.SRC_IN)
+
+                val foregroundColor = ContextCompat.getColor(context, R.color.icon_on_nc_grey)
+                avatar.drawable.mutate().colorFilter =
+                    BlendModeColorFilterCompat
+                        .createBlendModeColorFilterCompat(foregroundColor, BlendModeCompat.SRC_IN)
+            }
+            ShareType.EMAIL -> {
+                createAvatarBase(R.drawable.ic_email, AvatarPadding.LARGE)
+                androidViewThemeUtils.colorImageViewBackgroundAndIcon(avatar)
+            }
+            else -> Log_OC.d(TAG, "Unknown share type")
+        }
+    }
+}
diff --git a/app/src/main/res/drawable/first_run_talk.xml b/app/src/main/res/drawable/first_run_talk.xml
new file mode 100644
index 000000000..b2ed96f57
--- /dev/null
+++ b/app/src/main/res/drawable/first_run_talk.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M63.992,0.689C29.031,0.689 0.691,29.031 0.692,63.992c0,34.96 28.34,63.301 63.3,63.302 6.982,-0.014 13.881,-1.183 20.426,-3.43 4.317,-1.482 8.48,-3.433 12.411,-5.831 3.383,1.344 8.59,3.838 13.736,5.902 6.688,2.683 13.274,4.639 15.618,2.399 2.317,-2.212 0.703,-8.809 -1.647,-15.575 -2.046,-5.892 -4.649,-11.913 -5.701,-15.282 2.544,-4.415 4.535,-9.101 5.945,-13.954 1.648,-5.674 2.5,-11.574 2.512,-17.532C127.291,29.032 98.952,0.692 63.992,0.691ZM63.999,24.756l0.001,0c21.677,0 39.25,17.573 39.25,39.251 -0.001,21.677 -17.574,39.249 -39.251,39.249 -21.676,0 -39.249,-17.572 -39.25,-39.249 0,-21.678 17.573,-39.251 39.25,-39.251z"
+        android:strokeWidth="4.78543139" />
+</vector>

From e576292857ccabcd8637ca5337f31f2e801f5ddb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 21 Feb 2025 16:24:46 +0100
Subject: [PATCH 115/138] fix toOCShare

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/model/CreateShareResponseExtensions.kt     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
index e6eb6bc6a..7e30be5f9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -9,12 +9,7 @@ fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
             id = response.id.toLongOrNull() ?: -1L
             fileSource = response.fileSource
             itemSource = response.itemSource
-            shareType = when (response.shareType) {
-                0L -> ShareType.USER
-                1L -> ShareType.GROUP
-                3L -> ShareType.PUBLIC_LINK
-                else -> null
-            }
+            shareType = ShareType.fromValue(response.shareType.toInt())
             shareWith = response.shareWith
             path = response.path
             permissions = response.permissions.toInt()

From db6f425c925fa6832e29e0c126745ea207888544 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 21 Feb 2025 17:00:21 +0100
Subject: [PATCH 116/138] fix isHideFileDownload

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/model/CreateShareResponseExtensions.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
index 7e30be5f9..03bec35a7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -21,7 +21,7 @@ fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
             shareLink =  response.url
             isPasswordProtected = !response.password.isNullOrEmpty()
             note = response.note
-            isHideFileDownload = response.hideDownload > 0
+            isHideFileDownload = (response.hideDownload == 1L)
             label = response.label
             isHasPreview = response.hasPreview
             mimetype = response.mimetype

From 8228c47839c374c76239aee73c4af774397a3e4a Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 21 Feb 2025 17:05:13 +0100
Subject: [PATCH 117/138] solve git conflict

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 gradle/verification-metadata.xml | 133 +++++++++++++++++++++++++++----
 1 file changed, 119 insertions(+), 14 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d2c20743c..d3ee3a443 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -68,6 +68,7 @@
             <trusting group="com.vanniktech" name="ui-android" version="0.9.0"/>
          </trusted-key>
          <trusted-key id="4021EEEAFF5DE8404DCD0A270AA3E5C3D232E79B" group="jakarta.inject" name="jakarta.inject-api" version="2.0.1"/>
+         <trusted-key id="44F4797A52C336FA666CD9271DE461528F1F1B2A" group="org.apache.jackrabbit"/>
          <trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
          <trusted-key id="474DA67C32063DCA7FFE9CB5760F395DC40D55A7" group="^io[.]noties($|([.].*))" regex="true"/>
          <trusted-key id="47504B76CF89C15C0512D9AFE16AB52D79FD224F">
@@ -111,6 +112,7 @@
             <trusting group="androidx.recyclerview"/>
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
+            <trusting group="androidx.tracing"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -139,10 +141,12 @@
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.graphics"/>
             <trusting group="androidx.lifecycle"/>
+            <trusting group="androidx.recyclerview"/>
             <trusting group="androidx.test"/>
             <trusting group="androidx.test.espresso" name="espresso-idling-resource" version="3.6.1"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
+            <trusting group="androidx.work"/>
             <trusting group="androidx.work" name="work-runtime" version="2.9.1"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
@@ -859,6 +863,11 @@
             <sha256 value="2a10979bbb3bcd7b25b7f664ab4e9b016fabf2174a26768b677e12e4bea4c7c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core" version="1.15.0">
+         <artifact name="core-1.15.0.aar">
+            <sha256 value="432b85a1974076e14b487ece4a28c59a84f1b9efc3fc8be72cd7f05d32055e51" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core" version="1.9.0">
          <artifact name="core-1.9.0.module">
             <sha256 value="8674ade1d12962469dd2d1e6edc03b465f20d180b0840a129bc40b351e8651d1" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1560,6 +1569,11 @@
             <sha256 value="179fc4d2d022c0a8247e7612feab40b951bd8710f6b452e3ed6dc03a1e52769d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.recyclerview" name="recyclerview" version="1.4.0">
+         <artifact name="recyclerview-1.4.0.aar">
+            <sha256 value="0f32ccaffcda74c3f87f0b4cfe6ae78e8aa4eb3ad7dda4f2edf06eedc947a5cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.recyclerview" name="recyclerview-selection" version="1.1.0">
          <artifact name="recyclerview-selection-1.1.0.aar">
             <sha256 value="9e2ba1c7d6b0eb5e64c10b1b0eb01b51e8511cee002c9bd56ce9cc138ebc4898" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5559,6 +5573,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-common" version="0.24.0">
+         <artifact name="android-common-0.24.0.jar">
+            <sha256 value="68f3bc612c5f802e216c92450b667bc93cba91c8bfb754c2b9420ce802bf46b6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-common-0.24.0.pom">
+            <sha256 value="a7f8261ce3bc9e7196280c135b993666ae2682c26d1a7cb613b9ac7e15eeddea" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="2.19.0">
          <artifact name="android-library-2.19.0.aar">
             <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5663,6 +5685,14 @@
             <sha256 value="16df4da63602c412d8712018c4b35ce24cb040761bcbc026fbcd836dbe953171" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="core" version="0.24.0">
+         <artifact name="core-0.24.0.aar">
+            <sha256 value="38011f3adff2f68c6c99cb121a5def63cc44a66e393373203687b59c5fb82ce8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-0.24.0.module">
+            <sha256 value="4933e71a2214d32a50ac9b7eb8364d763a3d8359b846554bc61e252e2cd5b76a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.14.0">
          <artifact name="material-color-utilities-0.14.0.jar">
             <sha256 value="bfcd5205b056b948bc6ff9a556898188f4a4e92179c723906e10f1164b776eed" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5759,6 +5789,14 @@
             <sha256 value="ca3c0835e5534a549d3718380982ba8cead70613ca436d65606f16cd2e3a0f01" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.24.0">
+         <artifact name="material-color-utilities-0.24.0.jar">
+            <sha256 value="370a11bc5dc92c798d45e991c0bc98501b0e985558033db0e78994547b8b1e40" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="material-color-utilities-0.24.0.module">
+            <sha256 value="b044a07295fb43cd61c53ac656e3f44f9df42e87e6c82121eeb17c3c4d124557" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="ui" version="0.14.0">
          <artifact name="ui-0.14.0.aar">
             <sha256 value="2ff1b8ca1ce4d4151ce967c4704a4def19a128d3f710491872e007217f3ac84f" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5855,6 +5893,14 @@
             <sha256 value="4af371de8c6cd41a24f1a3ade9cd010c5d226a583d95ff909b1ca80f02d86db6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud.android-common" name="ui" version="0.24.0">
+         <artifact name="ui-0.24.0.aar">
+            <sha256 value="9eaf161c0535e87fec9585d97b5d5244229c7fdbde348bfebf7747f5bcd3f952" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-0.24.0.module">
+            <sha256 value="44a79acec2d56dc761557dec949ab539af6199d1267cc7fafb7a09c9be3f35f9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann" name="android-commons" version="1.0.0">
          <artifact name="android-commons-1.0.0.jar">
             <sha256 value="670f84d9ef31964f1b548204d83c81a44142106c69d4188b20556bc32f4ee3dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5871,6 +5917,14 @@
             <sha256 value="971a297faf2daee03b71226d28fd6ca4a0c7ee422d31ec1ab3e746b1514352d5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann" name="android-commons" version="1.0.4">
+         <artifact name="android-commons-1.0.4.jar">
+            <sha256 value="560504b80c5c9b49cd730a49484bfcb126daf349b96f27d56e39bcefd01e9f60" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-commons-1.0.4.pom">
+            <sha256 value="fb46388c6c881bc1b232af12478143a66a597f53344de51aece48ab9f2cc6b38" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="reactive-livedata" version="1.0.0">
          <artifact name="reactive-livedata-1.0.0.aar">
             <sha256 value="1066af08f3b5012b5e536e18ad4d28bf2241b4918485072bfdac0ff15696a4f2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5887,6 +5941,14 @@
             <sha256 value="e6e8113634c5b57f39af97a33dfdad1831620b39691555f75b623636772e2fae" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="reactive-livedata" version="1.0.4">
+         <artifact name="reactive-livedata-1.0.4.aar">
+            <sha256 value="a4142db1329b151611a947e8eeccc22a0736b1e02fa9e1b670865f21b26ded16" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="reactive-livedata-1.0.4.module">
+            <sha256 value="80ef426583b1c39abc4c772994d4d6250caaf5c61512165397ec0db7f9d95e28" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="shared-preferences" version="1.0.0">
          <artifact name="shared-preferences-1.0.0.aar">
             <sha256 value="d93ca7a27ec93daf5bad558f25bb834fb802b6efcf8045c8e2d62d63511cb972" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5903,6 +5965,14 @@
             <sha256 value="5dab2c5bd96fd744c4fa37e7f744cb71eb6e596123a115f96efdb51fe71614f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="shared-preferences" version="1.0.4">
+         <artifact name="shared-preferences-1.0.4.aar">
+            <sha256 value="2c6f484a5e464c001dce6340ef7a73f88c298220773898aaf2b32e01530cbb03" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="shared-preferences-1.0.4.module">
+            <sha256 value="995bc95943b40db2b06cbcc6ed2491eedaa622038b8b72ffb51ff7e97fd46174" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="util" version="1.0.0">
          <artifact name="util-1.0.0.aar">
             <sha256 value="01b6bd92d9be41b638344651d43ebe48e855aca8a3d83f00e73ecda3dcea65d4" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5919,6 +5989,14 @@
             <sha256 value="5a101de3906d3b21a8cb451460ee46ccb7d58c9183a5efd01e3b5a995844cf7f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="util" version="1.0.4">
+         <artifact name="util-1.0.4.aar">
+            <sha256 value="2c42fae1eb2cbd8cc234a4daef0d7cf987cab3b4326c767bb5aa731bb985d049" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="util-1.0.4.module">
+            <sha256 value="c4fbe8d79d62c853e09aaaf7243df084ab002621e3ec03f2cf1038331c2c10a6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="exception" version="2.0.1">
          <artifact name="exception-2.0.1.aar">
             <sha256 value="819c72bf825e650fbd39abc959f43a8a2809f0c45d9dce717ebbfc727e79f9f8" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5959,6 +6037,14 @@
             <sha256 value="ef19f3f37d22830af70692ada524c3feba3a52f8e30104009c3d6043aa8b7486" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="exception" version="2.3.5">
+         <artifact name="exception-2.3.5.aar">
+            <sha256 value="4aa0a60b8b468a123fbdf83d1576183b6efb2f55a18ee677c977a1463657b200" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="exception-2.3.5.module">
+            <sha256 value="6609d30a2df3cbc03aa62f42116c69566e72b67440c93f67972d8a7d1284b1eb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.1.0">
          <artifact name="markdown-2.1.0.aar">
             <sha256 value="588884e84e263e5a50b77cbb58eb06c2a48b73251195834b30659dfd18306153" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5991,6 +6077,14 @@
             <sha256 value="3de94ef528804ff9ee3e0d527596315a47f2e93e02d2b29c3badb3d865846d0f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.3.5">
+         <artifact name="markdown-2.3.5.aar">
+            <sha256 value="63459d23f17a2b3bec87d867c0e32fef2a090e79424962e0477bb8a0e4fc42e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="markdown-2.3.5.module">
+            <sha256 value="e589a3f9de77dd6fffd740daf71530817ec267d2b877352f09ed381847f682f9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.1.0">
          <artifact name="ocs-2.1.0.aar">
             <sha256 value="31f33b84bf0cbd1607dcbeffcd9ef52297e2d5c5a090e4e0992de16dc70f1589" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6023,6 +6117,14 @@
             <sha256 value="90f2dfa445d9a793c746dab3d3d9ea05b70832297f98e7bd17109336b8dd6b84" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.3.5">
+         <artifact name="ocs-2.3.5.aar">
+            <sha256 value="68d05984ed73143cbe61296236d5d8c91cfaae25a631e38b0969c1061e12e09d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="ocs-2.3.5.module">
+            <sha256 value="27a6fbdf3c95161caa57ea4128e0e3783df56ba13cf7c2a92df577a4541394d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.1.0">
          <artifact name="sso-glide-2.1.0.aar">
             <sha256 value="8fb3d57f5878ae3ae3124dc541e717ba205830999c87bdc9a8ffd56df2152fba" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6055,6 +6157,14 @@
             <sha256 value="69cbaee6b8b86213990b52234efc98b48d57e6eb9f3b9c6710b7d6c22d17f939" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.3.5">
+         <artifact name="sso-glide-2.3.5.aar">
+            <sha256 value="9662cd59068875eda5c6ee390b877c9e08fe633f7872bd0572536f67bae39703" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-glide-2.3.5.module">
+            <sha256 value="f916fb15c51e673708691c8c517385a00a8b1d0abbd9021032faa3ac99872337" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.1.0">
          <artifact name="sso-url-helper-2.1.0.aar">
             <sha256 value="6309e518b9637af17748b03d42f0306780bcd0c09d3ed338341b5a502d19292a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6087,6 +6197,14 @@
             <sha256 value="d7bc31e4e433640ef3596c36c1fd00fa9d2d5bca0a7602582f883c30cdecee20" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.3.5">
+         <artifact name="sso-url-helper-2.3.5.aar">
+            <sha256 value="4773790b99f88bc99984fc59a76a919493f972b11d46b8ddc0769558d74aead2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-url-helper-2.3.5.module">
+            <sha256 value="a6c157f21b3ea72db370940043cc7f1281ec49121e44c69c3a5a70c3aded6933" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.android" name="annotations" version="4.1.1.4">
          <artifact name="annotations-4.1.1.4.jar">
             <sha256 value="ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15" origin="Generated by Gradle"/>
@@ -7510,6 +7628,7 @@
          </artifact>
          <artifact name="jackrabbit-webdav-2.13.5.pom">
             <pgp value="44F4797A52C336FA666CD9271DE461528F1F1B2A"/>
+            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
@@ -8985,19 +9104,5 @@
             <sha256 value="138ebb33cce7080fd5cdb4fb90a0ee550173d7e8d41024da8c0d788b1460a1f3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
-
-      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
-         <artifact name="jackrabbit-parent-2.13.5.pom">
-            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
-      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
-         <artifact name="jackrabbit-webdav-2.13.5.jar">
-            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-         <artifact name="jackrabbit-webdav-2.13.5.pom">
-            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
-         </artifact>
-      </component>
    </components>
 </verification-metadata>

From 7bc133a90ab6fa4f87fef277391d77bae067d3a6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 2 Apr 2025 11:11:08 +0200
Subject: [PATCH 118/138] fix git conflict

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 gradle/verification-metadata.xml | 66 +++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 6e02a0906..88b3c8e29 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8,6 +8,7 @@
          <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
       </trusted-artifacts>
       <ignored-keys>
+         <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="EB095DA7D2F6AC0E" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
@@ -166,7 +167,10 @@
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD" group="io.grpc"/>
-         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314" group="org.apache.commons" name="commons-parent" version="52"/>
+         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
+            <trusting group="org.apache.commons"/>
+            <trusting group="org.apache.commons" name="commons-parent" version="52"/>
+         </trusted-key>
          <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
          <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
          <trusted-key id="BCC135FC7ED8214F823D73E97FE9900F412D622E" group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0"/>
@@ -6165,6 +6169,14 @@
             <sha256 value="ce28456d366507ca0f91022942a05e388fd98f862a6d8db3105c5c4497a74ce5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.bitfireAT" name="dav4jvm" version="2.2.1">
+         <artifact name="dav4jvm-2.2.1.jar">
+            <sha256 value="e6b8a9ff7ada0841198b18de2d6fd935f1f8754d3c84b8e8e3dc1840648d595d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="dav4jvm-2.2.1.module">
+            <sha256 value="977a16e0c70ee01139463fd4cbd9efd7d7a767c0c8b3e72941b69cbdd2f085d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.16.0">
          <artifact name="annotations-4.16.0.jar">
             <sha256 value="c59e39b1b31b4d5592277cd90012149d740b569d4338f56443cac82c3fbda3d1" origin="Generated by Gradle"/>
@@ -6292,6 +6304,14 @@
             <sha256 value="a7f8261ce3bc9e7196280c135b993666ae2682c26d1a7cb613b9ac7e15eeddea" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
          <artifact name="core-0.14.0.aar">
             <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -7314,6 +7334,11 @@
             <sha256 value="19ebc6f4bdb4edbb3d07b6ee994f846b54ef295582a9b5634719ffa9f31d03b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="31.1-android">
+         <artifact name="guava-31.1-android.pom">
+            <sha256 value="66292995644e95537ee97a89e8990171d8f3c26acf984830a7791997073d451d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava" version="31.1-jre">
          <artifact name="guava-31.1-jre.jar">
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
@@ -7847,6 +7872,22 @@
             <sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.2">
+         <artifact name="commons-codec-1.2.jar">
+            <sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-codec-1.2.pom">
+            <sha256 value="28d6c089355487fd2e973e091a152727ac27ad2b2c1ec9cbcf916a10fc863148" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="commons-httpclient" name="commons-httpclient" version="3.1">
+         <artifact name="commons-httpclient-3.1.jar">
+            <pgp value="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5"/>
+         </artifact>
+         <artifact name="commons-httpclient-3.1.pom">
+            <sha256 value="8a9b07d458d3e730221dbecdfafa7353ec1babd3b94c843227c47104a90c6d6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.13.0">
          <artifact name="commons-io-2.13.0.jar">
             <sha256 value="671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" origin="Generated by Gradle"/>
@@ -8391,6 +8432,11 @@
             <sha256 value="31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="10">
+         <artifact name="apache-10.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="13">
          <artifact name="apache-13.pom">
             <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
@@ -8532,6 +8578,19 @@
             <sha256 value="dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
+         <artifact name="jackrabbit-parent-2.13.5.pom">
+            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
+         <artifact name="jackrabbit-webdav-2.13.5.jar">
+            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="jackrabbit-webdav-2.13.5.pom">
+            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
          <artifact name="jose4j-0.9.5.jar">
             <sha256 value="808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" origin="Generated by Gradle"/>
@@ -9089,6 +9148,11 @@
             <sha256 value="4551e2c04331e1659fdb990dbcdd99606d8734b5a408df0a7b3b85b8c2984d70" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.0">
+         <artifact name="kotlin-gradle-plugins-bom-2.0.0.pom">
+            <sha256 value="c4a0586af77f0fb4f7e367033a02ac718beff0d0193cc7989583a982aa2752f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.1.0">
          <artifact name="kotlin-gradle-plugins-bom-2.1.0.module">
             <sha256 value="a81bd9adbd3ba75a05a6c3a3ed846e0c92a5a7ac4ce8363cf604b4f2c8a7b75c" origin="Generated by Gradle"/>

From 6557a204067d8819afd635b83a920206701b4028 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 3 Apr 2025 13:46:31 +0200
Subject: [PATCH 119/138] simplify

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareDetailActivity.kt    | 188 ++++++++++--------
 1 file changed, 103 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 8437292ca..347ba0476 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -106,7 +106,8 @@ class NoteShareDetailActivity : BrandedActivity(),
         }
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
+            val ssoAcc =
+                SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
             repository = ShareRepository(this@NoteShareDetailActivity, ssoAcc)
 
             withContext(Dispatchers.Main) {
@@ -124,27 +125,34 @@ class NoteShareDetailActivity : BrandedActivity(),
     override fun applyBrand(color: Int) {
         val util = BrandingUtil.of(color, this)
 
-        util.platform.themeRadioButton(binding.shareProcessPermissionReadOnly)
-        util.platform.themeRadioButton(binding.shareProcessPermissionUploadEditing)
-        util.platform.themeRadioButton(binding.shareProcessPermissionFileDrop)
+        binding.run {
+            util.platform.run {
+                themeRadioButton(shareProcessPermissionReadOnly)
+                themeRadioButton(shareProcessPermissionUploadEditing)
+                themeRadioButton(shareProcessPermissionFileDrop)
 
-        util.platform.colorTextView(binding.shareProcessEditShareLink)
-        util.platform.colorTextView(binding.shareProcessAdvancePermissionTitle)
-
-        util.platform.themeCheckbox(binding.shareProcessAllowResharingCheckbox)
+                colorTextView(shareProcessEditShareLink)
+                colorTextView(shareProcessAdvancePermissionTitle)
 
+                themeCheckbox(shareProcessAllowResharingCheckbox)
+            }
 
-        util.androidx.colorSwitchCompat(binding.shareProcessSetPasswordSwitch)
-        util.androidx.colorSwitchCompat(binding.shareProcessSetExpDateSwitch)
-        util.androidx.colorSwitchCompat(binding.shareProcessHideDownloadCheckbox)
-        util.androidx.colorSwitchCompat(binding.shareProcessChangeNameSwitch)
+            util.androidx.run {
+                colorSwitchCompat(shareProcessSetPasswordSwitch)
+                colorSwitchCompat(shareProcessSetExpDateSwitch)
+                colorSwitchCompat(shareProcessHideDownloadCheckbox)
+                colorSwitchCompat(shareProcessChangeNameSwitch)
+            }
 
-        util.material.colorTextInputLayout(binding.shareProcessEnterPasswordContainer)
-        util.material.colorTextInputLayout(binding.shareProcessChangeNameContainer)
-        util.material.colorTextInputLayout(binding.noteContainer)
+            util.material.run {
+                colorTextInputLayout(shareProcessEnterPasswordContainer)
+                colorTextInputLayout(shareProcessChangeNameContainer)
+                colorTextInputLayout(noteContainer)
 
-        util.material.colorMaterialButtonPrimaryFilled(binding.shareProcessBtnNext)
-        util.material.colorMaterialButtonPrimaryOutlined(binding.shareProcessBtnCancel)
+                colorMaterialButtonPrimaryFilled(shareProcessBtnNext)
+                colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
+            }
+        }
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -259,22 +267,24 @@ class NoteShareDetailActivity : BrandedActivity(),
     }
 
     private fun updateViewForInternalShare() {
-        binding.shareProcessChangeNameSwitch.visibility = View.GONE
-        binding.shareProcessChangeNameContainer.visibility = View.GONE
-        binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
-        if (isSecureShare) {
-            binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
-        } else {
-            binding.shareProcessAllowResharingCheckbox.visibility = View.VISIBLE
-        }
-        binding.shareProcessSetPasswordSwitch.visibility = View.GONE
+        binding.run {
+            shareProcessChangeNameSwitch.visibility = View.GONE
+            shareProcessChangeNameContainer.visibility = View.GONE
+            shareProcessHideDownloadCheckbox.visibility = View.GONE
+            if (isSecureShare) {
+                shareProcessAllowResharingCheckbox.visibility = View.GONE
+            } else {
+                shareProcessAllowResharingCheckbox.visibility = View.VISIBLE
+            }
+            shareProcessSetPasswordSwitch.visibility = View.GONE
 
-        if (share != null) {
-            if (!isReShareShown) {
-                binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+            if (share != null) {
+                if (!isReShareShown) {
+                    shareProcessAllowResharingCheckbox.visibility = View.GONE
+                }
+                shareProcessAllowResharingCheckbox.isChecked =
+                    SharingMenuHelper.canReshare(share)
             }
-            binding.shareProcessAllowResharingCheckbox.isChecked =
-                SharingMenuHelper.canReshare(share)
         }
     }
 
@@ -282,17 +292,19 @@ class NoteShareDetailActivity : BrandedActivity(),
      * update views where share type external or link share
      */
     private fun updateViewForExternalAndLinkShare() {
-        binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
-        binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
-        binding.shareProcessSetPasswordSwitch.visibility = View.VISIBLE
-
-        if (share != null) {
-            if (SharingMenuHelper.isFileDrop(share)) {
-                binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
-            } else {
-                binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
-                binding.shareProcessHideDownloadCheckbox.isChecked =
-                    share?.isHideFileDownload == true
+        binding.run {
+            shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+            shareProcessAllowResharingCheckbox.visibility = View.GONE
+            shareProcessSetPasswordSwitch.visibility = View.VISIBLE
+
+            if (share != null) {
+                if (SharingMenuHelper.isFileDrop(share)) {
+                    shareProcessHideDownloadCheckbox.visibility = View.GONE
+                } else {
+                    shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+                    shareProcessHideDownloadCheckbox.isChecked =
+                        share?.isHideFileDownload == true
+                }
             }
         }
     }
@@ -319,13 +331,15 @@ class NoteShareDetailActivity : BrandedActivity(),
     }
 
     private fun updateViewForFolder() {
-        binding.shareProcessPermissionUploadEditing.text =
-            getString(R.string.link_share_allow_upload_and_editing)
-        binding.shareProcessPermissionFileDrop.visibility = View.VISIBLE
-        if (isSecureShare) {
-            binding.shareProcessPermissionFileDrop.visibility = View.GONE
-            binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
-            binding.shareProcessSetExpDateSwitch.visibility = View.GONE
+        binding.run {
+            shareProcessPermissionUploadEditing.text =
+                getString(R.string.link_share_allow_upload_and_editing)
+            shareProcessPermissionFileDrop.visibility = View.VISIBLE
+            if (isSecureShare) {
+                shareProcessPermissionFileDrop.visibility = View.GONE
+                shareProcessAllowResharingCheckbox.visibility = View.GONE
+                shareProcessSetExpDateSwitch.visibility = View.GONE
+            }
         }
     }
 
@@ -333,44 +347,48 @@ class NoteShareDetailActivity : BrandedActivity(),
      * update views for screen type Note
      */
     private fun showShareProcessSecond() {
-        binding.shareProcessGroupOne.visibility = View.GONE
-        binding.shareProcessEditShareLink.visibility = View.GONE
-        binding.shareProcessGroupTwo.visibility = View.VISIBLE
-        if (share != null) {
-            binding.shareProcessBtnNext.text =
-                getString(R.string.note_share_detail_activity_set_note)
-            binding.noteText.setText(share?.note)
-        } else {
-            binding.shareProcessBtnNext.text =
-                getString(R.string.note_share_detail_activity_send_share)
-            binding.noteText.setText(R.string.empty)
+        binding.run {
+            shareProcessGroupOne.visibility = View.GONE
+            shareProcessEditShareLink.visibility = View.GONE
+            shareProcessGroupTwo.visibility = View.VISIBLE
+            if (share != null) {
+                shareProcessBtnNext.text =
+                    getString(R.string.note_share_detail_activity_set_note)
+                noteText.setText(share?.note)
+            } else {
+                shareProcessBtnNext.text =
+                    getString(R.string.note_share_detail_activity_send_share)
+                noteText.setText(R.string.empty)
+            }
+            shareProcessStep = SCREEN_TYPE_NOTE
+            shareProcessBtnNext.performClick()
         }
-        shareProcessStep = SCREEN_TYPE_NOTE
-        binding.shareProcessBtnNext.performClick()
     }
 
     private fun implementClickEvents() {
-        binding.shareProcessBtnCancel.setOnClickListener {
-            onCancelClick()
-        }
-        binding.shareProcessBtnNext.setOnClickListener {
-            if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
-                validateShareProcessFirst()
-            } else {
-                createOrUpdateShare()
+        binding.run {
+            shareProcessBtnCancel.setOnClickListener {
+                onCancelClick()
+            }
+            shareProcessBtnNext.setOnClickListener {
+                if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
+                    validateShareProcessFirst()
+                } else {
+                    createOrUpdateShare()
+                }
+            }
+            shareProcessSetPasswordSwitch.setOnCheckedChangeListener { _, isChecked ->
+                showPasswordInput(isChecked)
+            }
+            shareProcessSetExpDateSwitch.setOnCheckedChangeListener { _, isChecked ->
+                showExpirationDateInput(isChecked)
+            }
+            shareProcessChangeNameSwitch.setOnCheckedChangeListener { _, isChecked ->
+                showChangeNameInput(isChecked)
+            }
+            shareProcessSelectExpDate.setOnClickListener {
+                showExpirationDateDialog()
             }
-        }
-        binding.shareProcessSetPasswordSwitch.setOnCheckedChangeListener { _, isChecked ->
-            showPasswordInput(isChecked)
-        }
-        binding.shareProcessSetExpDateSwitch.setOnCheckedChangeListener { _, isChecked ->
-            showExpirationDateInput(isChecked)
-        }
-        binding.shareProcessChangeNameSwitch.setOnCheckedChangeListener { _, isChecked ->
-            showChangeNameInput(isChecked)
-        }
-        binding.shareProcessSelectExpDate.setOnClickListener {
-            showExpirationDateDialog()
         }
     }
 
@@ -429,9 +447,9 @@ class NoteShareDetailActivity : BrandedActivity(),
 
 
     private fun getReSharePermission(): Int {
-        val spb = SharePermissionsBuilder()
-        spb.setSharePermission(true)
-        return spb.build()
+        return SharePermissionsBuilder().apply {
+            setSharePermission(true)
+        }.build()
     }
 
     /**

From ff1527aeea38c93d521b52791cdc6d4403b25ca2 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 3 Apr 2025 15:59:38 +0200
Subject: [PATCH 120/138] fix duplication and avatar

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/adapter/ShareeListAdapter.java        | 11 ++++++++++-
 .../notes/share/adapter/holder/ShareViewHolder.java   |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 5e0aa7934..28a4bf2c6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -12,7 +12,9 @@
 import com.owncloud.android.lib.resources.shares.ShareType;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
@@ -136,7 +138,14 @@ public int getItemCount() {
 
     @SuppressLint("NotifyDataSetChanged")
     public void addShares(List<OCShare> sharesToAdd) {
-        shares.addAll(sharesToAdd);
+        Set<OCShare> uniqueShares = new LinkedHashSet<>(shares);
+
+        // Automatically removes duplicates
+        uniqueShares.addAll(sharesToAdd);
+
+        shares.clear();
+        shares.addAll(uniqueShares);
+
         sortShares();
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
index 2eadeca6a..52c3ff526 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
@@ -110,7 +110,7 @@ private void setPermissionName(String permissionName) {
 
     private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
         try {
-            AvatarLoader.INSTANCE.load(context, avatar, account);
+            AvatarLoader.INSTANCE.load(context, avatar, account, name);
         } catch (StringIndexOutOfBoundsException e) {
             avatar.setImageResource(fallback);
         }

From cce12b8e4c1e24ec4e38661fe4ddd5994b175320 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 17 Apr 2025 16:18:54 +0200
Subject: [PATCH 121/138] inject SharePasswordDialogListener

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../dialog/SharePasswordDialogFragment.kt     | 196 ++++++++++--------
 app/src/main/res/values/colors.xml            |   1 +
 2 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
index c195f3744..4a1646698 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/SharePasswordDialogFragment.kt
@@ -6,13 +6,15 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import androidx.core.content.ContextCompat
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.owncloud.android.lib.resources.shares.OCShare
 import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandedDialogFragment
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar
+import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.PasswordDialogBinding
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.shared.util.KeyboardUtils
@@ -25,7 +27,7 @@ import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgume
  *
  * Triggers the share when the password is introduced.
  */
-class SharePasswordDialogFragment : DialogFragment() {
+class SharePasswordDialogFragment : BrandedDialogFragment() {
 
     private var keyboardUtils: KeyboardUtils? = null
 
@@ -34,51 +36,45 @@ class SharePasswordDialogFragment : DialogFragment() {
     private var share: OCShare? = null
     private var createShare = false
     private var askForPassword = false
+    private var builder: MaterialAlertDialogBuilder? = null
+    private var listener: SharePasswordDialogListener? = null
+
+    interface SharePasswordDialogListener {
+        fun shareFileViaPublicShare(note: Note?, password: String?)
+        fun setPasswordToShare(share: OCShare, password: String?)
+    }
 
     override fun onStart() {
         super.onStart()
 
         val alertDialog = dialog as AlertDialog?
+        if (alertDialog == null) {
+            return
+        }
 
-        if (alertDialog != null) {
-            val positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) as MaterialButton?
-            if (positiveButton != null) {
-                // viewThemeUtils?.material?.colorMaterialButtonPrimaryTonal(positiveButton)
-                positiveButton.setOnClickListener {
-                    val sharePassword = binding?.sharePassword?.text
-
-                    if (sharePassword != null) {
-                        val password = sharePassword.toString()
-                        if (!askForPassword && TextUtils.isEmpty(password)) {
-                            BrandedSnackbar.make(
-                                binding!!.root,
-                                getString(R.string.note_share_detail_activity_share_link_empty_password),
-                                Snackbar.LENGTH_LONG
-                            )
-                                .show()
-                            return@setOnClickListener
-                        }
-                        if (share == null) {
-                            setPassword(createShare, note, password)
-                        } else {
-                            setPassword(share!!, password)
-                        }
-                    }
-
-                    alertDialog.dismiss()
+        val positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) as MaterialButton?
+        positiveButton?.setOnClickListener {
+            val sharePassword = binding?.sharePassword?.text
+
+            if (sharePassword != null) {
+                val password = sharePassword.toString()
+                if (!askForPassword && TextUtils.isEmpty(password)) {
+                    BrandedSnackbar.make(
+                        binding!!.root,
+                        getString(R.string.note_share_detail_activity_share_link_empty_password),
+                        Snackbar.LENGTH_LONG
+                    )
+                        .show()
+                    return@setOnClickListener
+                }
+                if (share == null) {
+                    listener?.shareFileViaPublicShare(note, password)
+                } else {
+                    listener?.setPasswordToShare(share!!, password)
                 }
             }
 
-            val negativeButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE) as MaterialButton?
-            if (negativeButton != null) {
-                //viewThemeUtils?.material?.colorMaterialButtonPrimaryBorderless(negativeButton)
-            }
-
-            val neutralButton = alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL) as MaterialButton?
-            if (neutralButton != null) {
-                // val warningColorId = ContextCompat.getColor(requireContext(), R.color.highlight_textColor_Warning)
-                //viewThemeUtils?.platform?.colorTextButtons(warningColorId, neutralButton)
-            }
+            alertDialog.dismiss()
         }
     }
 
@@ -100,7 +96,6 @@ class SharePasswordDialogFragment : DialogFragment() {
 
         // Setup layout
         binding?.sharePassword?.setText(R.string.empty)
-       // viewThemeUtils?.material?.colorTextInputLayout(binding!!.sharePasswordContainer)
 
         val neutralButtonTextId: Int
         val title: Int
@@ -113,8 +108,8 @@ class SharePasswordDialogFragment : DialogFragment() {
         }
 
         // Build the dialog
-        val builder = MaterialAlertDialogBuilder(requireContext())
-        builder.setView(binding!!.root)
+        builder = MaterialAlertDialogBuilder(requireContext())
+        builder!!.setView(binding!!.root)
             .setPositiveButton(R.string.common_ok, null)
             .setNegativeButton(R.string.common_delete) { _: DialogInterface?, _: Int -> callSetPassword() }
             .setNeutralButton(neutralButtonTextId) { _: DialogInterface?, _: Int ->
@@ -124,42 +119,50 @@ class SharePasswordDialogFragment : DialogFragment() {
             }
             .setTitle(title)
 
-        // viewThemeUtils?.dialog?.colorMaterialAlertDialogBackground(requireContext(), builder)
-
-        return builder.create()
+        return builder!!.create()
     }
 
     private fun callSetPassword() {
+        val password = binding?.sharePassword?.text.toString().trim()
         if (share == null) {
-            setPassword(createShare, note, null)
+            listener?.shareFileViaPublicShare(note, password)
         } else {
-            setPassword(share!!, null)
+            listener?.setPasswordToShare(share!!, password)
         }
     }
 
-    private fun setPassword(createShare: Boolean, note: Note?, password: String?) {
-        /*
-        val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
-        if (createShare) {
-            fileOperationsHelper.shareFileViaPublicShare(note, password)
-        } else {
-            fileOperationsHelper.setPasswordToShare(share, password)
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
+    override fun applyBrand(color: Int) {
+        val util = BrandingUtil.of(color, requireContext())
+        builder?.let {
+            util?.dialog?.colorMaterialAlertDialogBackground(requireContext(), it)
         }
-         */
 
-    }
+        val alertDialog = dialog as AlertDialog?
+        val positiveButton = alertDialog?.getButton(AlertDialog.BUTTON_POSITIVE) as? MaterialButton?
+        if (positiveButton != null) {
+            util?.material?.colorMaterialButtonPrimaryTonal(positiveButton)
+        }
 
-    private fun setPassword(share: OCShare, password: String?) {
-        /*
-         val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper ?: return
-        fileOperationsHelper.setPasswordToShare(share, password)
-         */
+        val negativeButton = alertDialog?.getButton(AlertDialog.BUTTON_NEGATIVE) as? MaterialButton?
+        if (negativeButton != null) {
+            util?.material?.colorMaterialButtonPrimaryBorderless(negativeButton)
+        }
 
-    }
+        val neutralButton = alertDialog?.getButton(AlertDialog.BUTTON_NEUTRAL) as? MaterialButton?
+        if (neutralButton != null) {
+            val warningColorId =
+                ContextCompat.getColor(requireContext(), R.color.highlight_textColor_Warning)
+            util?.platform?.colorTextButtons(warningColorId, neutralButton)
+        }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        binding = null
+        binding?.sharePasswordContainer?.let {
+            util?.material?.colorTextInputLayout(it)
+        }
     }
 
     companion object {
@@ -172,7 +175,7 @@ class SharePasswordDialogFragment : DialogFragment() {
         /**
          * Public factory method to create new SharePasswordDialogFragment instances.
          *
-         * @param file        OCFile bound to the public share that which
+         * @param note        Note bound to the public share that which
          * password will be set or updated
          * @param createShare When 'true', the request for password will be
          * followed by the creation of a new public link
@@ -180,14 +183,22 @@ class SharePasswordDialogFragment : DialogFragment() {
          * @return Dialog ready to show.
          */
         @JvmStatic
-        fun newInstance(note: Note?, createShare: Boolean, askForPassword: Boolean): SharePasswordDialogFragment {
-            val frag = SharePasswordDialogFragment()
-            val args = Bundle()
-            args.putSerializable(ARG_FILE, note)
-            args.putBoolean(ARG_CREATE_SHARE, createShare)
-            args.putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
-            frag.arguments = args
-            return frag
+        fun newInstance(
+            note: Note?,
+            createShare: Boolean,
+            askForPassword: Boolean,
+            dialogListener: SharePasswordDialogListener
+        ): SharePasswordDialogFragment {
+            val bundle = Bundle().apply {
+                putSerializable(ARG_FILE, note)
+                putBoolean(ARG_CREATE_SHARE, createShare)
+                putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
+            }
+
+            return SharePasswordDialogFragment().apply {
+                listener = dialogListener
+                arguments = bundle
+            }
         }
 
         /**
@@ -197,13 +208,20 @@ class SharePasswordDialogFragment : DialogFragment() {
          * @return Dialog ready to show.
          */
         @JvmStatic
-        fun newInstance(share: OCShare?, askForPassword: Boolean): SharePasswordDialogFragment {
-            val frag = SharePasswordDialogFragment()
-            val args = Bundle()
-            args.putParcelable(ARG_SHARE, share)
-            args.putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
-            frag.arguments = args
-            return frag
+        fun newInstance(
+            share: OCShare?,
+            askForPassword: Boolean,
+            dialogListener: SharePasswordDialogListener
+        ): SharePasswordDialogFragment {
+            val bundle = Bundle().apply {
+                putParcelable(ARG_SHARE, share)
+                putBoolean(ARG_ASK_FOR_PASSWORD, askForPassword)
+            }
+
+            return SharePasswordDialogFragment().apply {
+                listener = dialogListener
+                arguments = bundle
+            }
         }
 
         /**
@@ -212,12 +230,18 @@ class SharePasswordDialogFragment : DialogFragment() {
          * @param share OCFile bound to the public share that which password will be set or updated
          * @return Dialog ready to show.
          */
-        fun newInstance(share: OCShare?): SharePasswordDialogFragment {
-            val frag = SharePasswordDialogFragment()
-            val args = Bundle()
-            args.putParcelable(ARG_SHARE, share)
-            frag.arguments = args
-            return frag
+        fun newInstance(
+            share: OCShare?,
+            dialogListener: SharePasswordDialogListener
+        ): SharePasswordDialogFragment {
+            val bundle = Bundle().apply {
+                putParcelable(ARG_SHARE, share)
+            }
+
+            return SharePasswordDialogFragment().apply {
+                listener = dialogListener
+                arguments = bundle
+            }
         }
     }
 }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bd14e44ea..1a688fe65 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,6 +17,7 @@
     <color name="text_color">#333333</color>
     <color name="bg_fallback_highlight">#616161</color>
     <color name="fg_inverse">#FFFFFF</color>
+    <color name="highlight_textColor_Warning">#e53935</color>
 
     <color name="defaultBrand">#0082C9</color>
     <color name="secondary_text_color">#666666</color>

From 35de859539eb297d7feaa6e3205153435510644a Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 23 Apr 2025 15:26:56 +0200
Subject: [PATCH 122/138] implement interfaces

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 53 ++++++++++++++++-
 .../notes/share/NoteShareDetailActivity.kt    | 52 +++-------------
 .../notes/share/repository/ShareRepository.kt | 59 ++++++++++++++++++-
 3 files changed, 116 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 9f4d0f9ba..e73f1aae1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -33,6 +33,8 @@
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
@@ -45,6 +47,7 @@
 import it.niedermann.owncloud.notes.branding.BrandedSnackbar;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
+import it.niedermann.owncloud.notes.main.MainActivity;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -57,6 +60,7 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.UpdateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -65,7 +69,7 @@
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
 import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;
 
-public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
+public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, NoteShareItemAction, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions, SharePasswordDialogFragment.SharePasswordDialogListener {
 
     private static final String TAG = "NoteShareActivity";
     public static final String ARG_NOTE = "NOTE";
@@ -343,7 +347,7 @@ public void createPublicShareLink() {
     }
 
     public void requestPasswordForShareViaLink(boolean createShare, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note, createShare, askForPassword);
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(note, createShare, askForPassword, this);
         dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
@@ -405,7 +409,7 @@ public void showPermissionsDialog(OCShare share) {
 
     @Override
     public void requestPasswordForShare(OCShare share, boolean askForPassword) {
-        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword);
+        SharePasswordDialogFragment dialog = SharePasswordDialogFragment.newInstance(share, askForPassword, this);
         dialog.show(getSupportFragmentManager(), SharePasswordDialogFragment.PASSWORD_FRAGMENT);
     }
 
@@ -688,4 +692,47 @@ protected void onDestroy() {
         executorService.shutdown();
         super.onDestroy();
     }
+
+    @Override
+    public void shareFileViaPublicShare(@Nullable Note note, @Nullable String password) {
+        if (note == null || password == null) {
+            Log_OC.d(TAG, "note or password is null, cannot create a public share");
+            return;
+        }
+
+        executorService.submit(() -> {
+            final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", password, 0, "");
+            runOnUiThread(() -> {
+                if (result != null) {
+                    NoteShareActivity.this.recreate();
+                } else {
+                    final var message = getString(R.string.note_share_activity_you_are_not_allowed_to_share);
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
+                }
+            });
+        });
+    }
+
+    @Override
+    public void setPasswordToShare(@NotNull OCShare share, @Nullable String password) {
+        if (password == null) {
+            Log_OC.d(TAG, "password is null, cannot update a public share");
+            return;
+        }
+
+        executorService.submit(() -> {{
+            final var requestBody = repository.getUpdateShareRequest(false, share,"", password,false,-1,0);
+            final var success = repository.updateShare(share.getId(), requestBody);
+
+            runOnUiThread(() -> {
+                if (success) {
+                    final var intent = new Intent(NoteShareActivity.this, MainActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    NoteShareActivity.this.startActivity(intent);
+                } else {
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.note_share_detail_activity_create_share_error));
+                }
+            });
+        }});
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 347ba0476..5556af279 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -20,10 +20,7 @@ import it.niedermann.owncloud.notes.main.MainActivity
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
-import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
-import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
-import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil
@@ -34,7 +31,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.text.SimpleDateFormat
 import java.util.Date
-import java.util.Locale
 
 /**
  * Activity class to show share permission options, set expiration date, change label, set password, send note
@@ -518,16 +514,6 @@ class NoteShareDetailActivity : BrandedActivity(),
         else -> permission
     }
 
-    private fun getExpirationDate(): String? {
-        if (chosenExpDateInMills == -1L) {
-            return null
-        }
-
-        val date = Date(chosenExpDateInMills)
-
-        return SimpleDateFormat("yyyy-MM-dd", Locale.US).format(date)
-    }
-
     /**
      * method to validate step 2 (note screen) information
      */
@@ -545,37 +531,15 @@ class NoteShareDetailActivity : BrandedActivity(),
     }
 
     private suspend fun updateShare(noteText: String, password: String, sendEmail: Boolean) {
-        val capabilities = repository.capabilities()
-        val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
         val downloadPermission = !binding.shareProcessHideDownloadCheckbox.isChecked
-
-        val shareAttributes = arrayOf(
-            if (shouldUseShareAttributesV2) {
-                ShareAttributesV2(
-                    scope = "permissions",
-                    key = "download",
-                    value = downloadPermission
-                )
-            } else {
-                ShareAttributesV1(
-                    scope = "permissions",
-                    key = "download",
-                    enabled = downloadPermission
-                )
-            }
-        )
-
-        val attributes = gson.toJson(shareAttributes)
-
-        val requestBody = UpdateShareRequest(
-            share_id = share!!.id.toInt(),
-            permissions = if (permission == -1) null else permission,
-            password = password,
-            publicUpload = "false",
-            expireDate = getExpirationDate(),
-            note = noteText,
-            attributes = attributes,
-            sendMail = sendEmail.toString()
+        val requestBody = repository.getUpdateShareRequest(
+            downloadPermission,
+            share,
+            noteText,
+            password,
+            sendEmail,
+            chosenExpDateInMills,
+            permission
         )
 
         val updateShareResult = repository.updateShare(share!!.id, requestBody)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 1944c8840..ba11e5421 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -13,6 +13,8 @@ import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
@@ -21,10 +23,14 @@ import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
 import org.json.JSONObject
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 
 class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
 
     private val tag = "ShareRepository"
+    private val gson = Gson()
     private val apiProvider: ApiProvider by lazy { ApiProvider.getInstance() }
     private val notesRepository: NotesRepository by lazy {
         NotesRepository.getInstance(
@@ -144,7 +150,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
                 respPartialCircles
             )
 
-            val gson = Gson()
             return jsonResults.flatMap { jsonResult ->
                 jsonResult.map { linkedTreeMap ->
                     JSONObject(gson.toJson(linkedTreeMap))
@@ -155,6 +160,58 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun getUpdateShareRequest(
+        downloadPermission: Boolean,
+        share: OCShare?,
+        noteText: String,
+        password: String,
+        sendEmail: Boolean,
+        chosenExpDateInMills: Long,
+        permission: Int
+    ): UpdateShareRequest {
+        val capabilities = capabilities()
+        val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
+
+        val shareAttributes = arrayOf(
+            if (shouldUseShareAttributesV2) {
+                ShareAttributesV2(
+                    scope = "permissions",
+                    key = "download",
+                    value = downloadPermission
+                )
+            } else {
+                ShareAttributesV1(
+                    scope = "permissions",
+                    key = "download",
+                    enabled = downloadPermission
+                )
+            }
+        )
+
+        val attributes = gson.toJson(shareAttributes)
+
+        return UpdateShareRequest(
+            share_id = share!!.id.toInt(),
+            permissions = if (permission == -1) null else permission,
+            password = password,
+            publicUpload = "false",
+            expireDate = getExpirationDate(chosenExpDateInMills),
+            note = noteText,
+            attributes = attributes,
+            sendMail = sendEmail.toString()
+        )
+    }
+
+    private fun getExpirationDate(chosenExpDateInMills: Long): String? {
+        if (chosenExpDateInMills == -1L) {
+            return null
+        }
+
+        val date = Date(chosenExpDateInMills)
+
+        return SimpleDateFormat("yyyy-MM-dd", Locale.US).format(date)
+    }
+
     fun capabilities(): Capabilities = notesRepository.capabilities
 
     fun getShares(remoteId: Long): List<OCShare>? {

From 029447eaebf83f9091413c5e27c5588195164f1b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 23 Apr 2025 15:37:52 +0200
Subject: [PATCH 123/138] add default permissions

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../sync/CapabilitiesDeserializer.java        |  2 ++
 .../notes/share/NoteShareActivity.java        | 20 +++++++++++++++++--
 .../notes/shared/model/Capabilities.java      |  9 +++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
index 42efdcb18..b9b5e959c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java
@@ -75,7 +75,9 @@ public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializat
                 final var enforced = password.getAsJsonPrimitive("enforced");
                 final var askForOptionalPassword = password.getAsJsonPrimitive("askForOptionalPassword");
                 final var isReSharingAllowed = filesSharing.getAsJsonPrimitive("resharing");
+                final var defaultPermission = filesSharing.getAsJsonPrimitive("default_permissions");
 
+                response.setDefaultPermission(defaultPermission.getAsInt());
                 response.setPublicPasswordEnforced(enforced.getAsBoolean());
                 response.setAskForOptionalPassword(askForOptionalPassword.getAsBoolean());
                 response.setReSharingAllowed(isReSharingAllowed.getAsBoolean());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e73f1aae1..fd45bca72 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -701,7 +701,16 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
         }
 
         executorService.submit(() -> {
-            final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", password, 0, "");
+            final var result = repository.addShare(
+                    note,
+                    ShareType.PUBLIC_LINK,
+                    "",
+                    "false",
+                    password,
+                    repository.capabilities().getDefaultPermission(),
+                    ""
+            );
+
             runOnUiThread(() -> {
                 if (result != null) {
                     NoteShareActivity.this.recreate();
@@ -721,7 +730,14 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
         }
 
         executorService.submit(() -> {{
-            final var requestBody = repository.getUpdateShareRequest(false, share,"", password,false,-1,0);
+            final var requestBody = repository.getUpdateShareRequest(false,
+                    share,
+                    "",
+                    password,
+                    false,
+                    -1,
+                    repository.capabilities().getDefaultPermission()
+            );
             final var success = repository.updateShare(share.getId(), requestBody);
 
             runOnUiThread(() -> {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index b7a8aaed2..21d7a806c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -42,6 +42,7 @@ public class Capabilities implements Serializable {
     private boolean publicPasswordEnforced;
     private boolean askForOptionalPassword;
     private boolean isReSharingAllowed;
+    private int defaultPermission;
 
     public boolean isReSharingAllowed() {
         return isReSharingAllowed;
@@ -59,6 +60,14 @@ public void setPublicPasswordEnforced(boolean value) {
         this.publicPasswordEnforced = value;
     }
 
+    public int getDefaultPermission() {
+        return defaultPermission;
+    }
+
+    public void setDefaultPermission(int value) {
+        this.defaultPermission = value;
+    }
+
     public boolean getAskForOptionalPassword() {
         return askForOptionalPassword;
     }

From 884c8cbda26bd71be82ab30496e83ac88f622800 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 23 Apr 2025 15:53:18 +0200
Subject: [PATCH 124/138] better error handling

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 24 ++++++++++---------
 .../notes/share/NoteShareDetailActivity.kt    |  4 ++--
 .../notes/share/repository/ShareRepository.kt | 21 ++++++++++++----
 app/src/main/res/values/strings.xml           |  4 ++++
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index fd45bca72..f97bf6204 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -333,14 +333,14 @@ public void createPublicShareLink() {
             executorService.submit(() -> {
                 final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
                 if (result != null) {
-                    note.setIsShared(true);
-                    repository.updateNote(note);
-                    runOnUiThread(this::recreate);
-                } else {
-                    runOnUiThread(() -> {
-                        final var message = getString(R.string.note_share_activity_you_are_not_allowed_to_share);
-                        DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
-                    });
+                    final var message = result.getSecond();
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
+
+                    if (result.getFirst()) {
+                        note.setIsShared(true);
+                        repository.updateNote(note);
+                        runOnUiThread(this::recreate);
+                    }
                 }
             });
         }
@@ -713,10 +713,12 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
 
             runOnUiThread(() -> {
                 if (result != null) {
-                    NoteShareActivity.this.recreate();
-                } else {
-                    final var message = getString(R.string.note_share_activity_you_are_not_allowed_to_share);
+                    final var message = result.getSecond();
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
+
+                    if (result.getFirst()) {
+                        NoteShareActivity.this.recreate();
+                    }
                 }
             });
         });
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 5556af279..5123a70b4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -576,11 +576,11 @@ class NoteShareDetailActivity : BrandedActivity(),
             noteText
         )
 
-        if (result != null) {
+        if (result != null && result.first) {
             repository.getSharesForNotesAndSaveShareEntities()
         }
 
-        handleResult(result != null)
+        handleResult(result != null && result.first)
     }
 
     private suspend fun handleResult(success: Boolean) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index ba11e5421..43ba98712 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -7,6 +7,7 @@ import com.nextcloud.android.sso.model.SingleSignOnAccount
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.persistence.ApiProvider
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
@@ -325,7 +326,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         password: String = "",
         permissions: Int = 0,
         shareNote: String = ""
-    ): CreateShareResponse? {
+    ): Pair<Boolean, String>? {
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
         val notesPathResponseResult = notesPathResponse.body() ?: return null
@@ -345,22 +346,34 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.addShare(request = requestBody)
         val response = call.execute()
+        val defaultErrorMessage = applicationContext.getString(R.string.note_share_activity_cannot_created)
+
         return try {
             if (response.isSuccessful) {
                 val createShareResponse = response.body()
                 Log_OC.d(tag, "Response successful: $createShareResponse")
-                createShareResponse?.ocs?.data
+                true to applicationContext.getString(R.string.note_share_created)
             } else {
                 val errorBody = response.errorBody()?.string()
+                if (errorBody == null) {
+                    return false to defaultErrorMessage
+                }
                 Log_OC.d(tag, "Response failed: $errorBody")
-                null
+                false to (extractErrorMessage(errorBody) ?: defaultErrorMessage)
             }
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while creating share", e)
-            null
+            false to defaultErrorMessage
         }
     }
 
+    private fun extractErrorMessage(json: String): String {
+        val jsonObject = JSONObject(json)
+        return jsonObject.getJSONObject("ocs")
+            .getJSONObject("meta")
+            .getString("message")
+    }
+
     fun updateSharePermission(
         shareId: Long,
         permissions: Int? = null,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55b4c34d7..919f5fe49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,6 +74,10 @@
     <string name="note_share_activity_contact_no_permission">Contact permission is required.</string>
     <string name="note_share_activity_you_are_not_allowed_to_share">You are not allowed to create a public share.</string>
 
+    <string name="note_share_created">Share created</string>
+    <string name="note_share_activity_cannot_created">You are not allowed to create a share.</string>
+
+
     <!-- NoteShareDetailActivity -->
     <string name="note_share_detail_activity_advanced_settings">Advanced Settings</string>
     <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>

From 316bf2dda469c72cd549b6658f38727ff21789a3 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 09:09:44 +0200
Subject: [PATCH 125/138] create generic response error message

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/repository/ShareRepository.kt  | 18 ++++++------------
 .../shared/util/extensions/CallExtensions.kt   | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/CallExtensions.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 43ba98712..1dd887460 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -23,6 +23,7 @@ import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
+import it.niedermann.owncloud.notes.shared.util.extensions.getErrorMessage
 import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -210,7 +211,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
 
         val date = Date(chosenExpDateInMills)
 
-        return SimpleDateFormat("yyyy-MM-dd", Locale.US).format(date)
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(date)
     }
 
     fun capabilities(): Capabilities = notesRepository.capabilities
@@ -354,12 +355,12 @@ class ShareRepository(private val applicationContext: Context, private val accou
                 Log_OC.d(tag, "Response successful: $createShareResponse")
                 true to applicationContext.getString(R.string.note_share_created)
             } else {
-                val errorBody = response.errorBody()?.string()
-                if (errorBody == null) {
+                val errorMessage = response.getErrorMessage()
+                if (errorMessage == null) {
                     return false to defaultErrorMessage
                 }
-                Log_OC.d(tag, "Response failed: $errorBody")
-                false to (extractErrorMessage(errorBody) ?: defaultErrorMessage)
+                Log_OC.d(tag, "Response failed: $errorMessage")
+                false to errorMessage
             }
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while creating share", e)
@@ -367,13 +368,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
-    private fun extractErrorMessage(json: String): String {
-        val jsonObject = JSONObject(json)
-        return jsonObject.getJSONObject("ocs")
-            .getJSONObject("meta")
-            .getString("message")
-    }
-
     fun updateSharePermission(
         shareId: Long,
         permissions: Int? = null,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/CallExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/CallExtensions.kt
new file mode 100644
index 000000000..46c40e711
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/CallExtensions.kt
@@ -0,0 +1,17 @@
+package it.niedermann.owncloud.notes.shared.util.extensions
+
+import it.niedermann.owncloud.notes.shared.model.OcsResponse
+import org.json.JSONObject
+import retrofit2.Response
+
+fun <T> Response<OcsResponse<T>>.getErrorMessage(): String? {
+    if (isSuccessful) {
+        return null
+    }
+
+    val errorBody = errorBody()?.string() ?: return null
+    val jsonObject = JSONObject(errorBody)
+    return jsonObject.getJSONObject("ocs")
+        .getJSONObject("meta")
+        .getString("message")
+}

From 1a0c9e90a492bdfa72a5088732d2b230ce10965b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 09:14:26 +0200
Subject: [PATCH 126/138] extract non-repository logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java      |  7 +++----
 .../notes/share/repository/ShareRepository.kt        | 12 ++++--------
 .../notes/shared/util/extensions/DateExtensions.kt   |  9 +++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/DateExtensions.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index f97bf6204..1b21f0b01 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -60,7 +60,6 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
-import it.niedermann.owncloud.notes.share.model.UpdateShareRequest;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -111,7 +110,7 @@ private void initializeArguments() {
             try {
                 final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
                 repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
-                capabilities = repository.capabilities();
+                capabilities = repository.getCapabilities();
                 repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
@@ -707,7 +706,7 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
                     "",
                     "false",
                     password,
-                    repository.capabilities().getDefaultPermission(),
+                    repository.getCapabilities().getDefaultPermission(),
                     ""
             );
 
@@ -738,7 +737,7 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
                     password,
                     false,
                     -1,
-                    repository.capabilities().getDefaultPermission()
+                    repository.getCapabilities().getDefaultPermission()
             );
             final var success = repository.updateShare(share.getId(), requestBody);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 1dd887460..4a0e3dd29 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -13,7 +13,6 @@ import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
-import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
 import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
@@ -24,10 +23,9 @@ import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
 import it.niedermann.owncloud.notes.shared.util.extensions.getErrorMessage
+import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateString
 import org.json.JSONObject
-import java.text.SimpleDateFormat
 import java.util.Date
-import java.util.Locale
 
 class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
 
@@ -171,7 +169,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         chosenExpDateInMills: Long,
         permission: Int
     ): UpdateShareRequest {
-        val capabilities = capabilities()
+        val capabilities = getCapabilities()
         val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
 
         val shareAttributes = arrayOf(
@@ -209,12 +207,10 @@ class ShareRepository(private val applicationContext: Context, private val accou
             return null
         }
 
-        val date = Date(chosenExpDateInMills)
-
-        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(date)
+        return Date(chosenExpDateInMills).toExpirationDateString()
     }
 
-    fun capabilities(): Capabilities = notesRepository.capabilities
+    fun getCapabilities(): Capabilities = notesRepository.capabilities
 
     fun getShares(remoteId: Long): List<OCShare>? {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/DateExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/DateExtensions.kt
new file mode 100644
index 000000000..3426b180a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/DateExtensions.kt
@@ -0,0 +1,9 @@
+package it.niedermann.owncloud.notes.shared.util.extensions
+
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+fun Date.toExpirationDateString(): String {
+    return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(this)
+}

From 39d01e3ee6c60161ed15c3502fdca6cc265bfc8f Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 09:18:30 +0200
Subject: [PATCH 127/138] extract non-repository logic

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/repository/ShareRepository.kt | 56 ++++++++++++-------
 .../notes/shared/util/StringConstants.kt      |  5 ++
 2 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/StringConstants.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 4a0e3dd29..e1a3f11b8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -22,12 +22,16 @@ import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
+import it.niedermann.owncloud.notes.shared.util.StringConstants
 import it.niedermann.owncloud.notes.shared.util.extensions.getErrorMessage
 import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateString
 import org.json.JSONObject
 import java.util.Date
 
-class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
+class ShareRepository(
+    private val applicationContext: Context,
+    private val account: SingleSignOnAccount
+) {
 
     private val tag = "ShareRepository"
     private val gson = Gson()
@@ -48,7 +52,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val notesPathResponseResult = getNotesPathResponseResult() ?: return null
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
-        return  "/" + notesPath + "/" + note.title + notesSuffix
+        return StringConstants.PATH + notesPath + StringConstants.PATH + note.title + notesSuffix
     }
 
     fun getShareEntitiesForSpecificNote(note: Note): List<ShareEntity> {
@@ -56,6 +60,17 @@ class ShareRepository(private val applicationContext: Context, private val accou
         return notesRepository.getShareEntities(path)
     }
 
+    private fun getExpirationDate(chosenExpDateInMills: Long): String? {
+        if (chosenExpDateInMills == -1L) {
+            return null
+        }
+
+        return Date(chosenExpDateInMills).toExpirationDateString()
+    }
+
+    fun getCapabilities(): Capabilities = notesRepository.capabilities
+
+    // region API calls
     fun getSharesForNotesAndSaveShareEntities() {
         val notesPathResponseResult = getNotesPathResponseResult() ?: return
         val notesPath = notesPathResponseResult.notesPath
@@ -69,7 +84,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
             if (call != null) {
                 val respOCS = call["ocs"] as? LinkedTreeMap<*, *>
                 val respData = respOCS?.getList("data")
-                respData?.forEach { data  ->
+                respData?.forEach { data ->
                     val map = data as? LinkedTreeMap<*, *>
                     val id = map?.get("id") as? String
                     val note = map?.get("note") as? String
@@ -117,7 +132,11 @@ class ShareRepository(private val applicationContext: Context, private val accou
         perPage: Int
     ): ArrayList<JSONObject> {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val call = shareAPI.getSharees(search = searchString, page = page.toString(), perPage = perPage.toString())
+        val call = shareAPI.getSharees(
+            search = searchString,
+            page = page.toString(),
+            perPage = perPage.toString()
+        )
         return if (call != null) {
             val respOCS = call["ocs"] as? LinkedTreeMap<*, *>
             val respData = respOCS?.get("data") as? LinkedTreeMap<*, *>
@@ -127,13 +146,15 @@ class ShareRepository(private val applicationContext: Context, private val accou
             val respExactGroups = respExact?.getList("groups")
             val respExactRemotes = respExact?.getList("remotes")
             val respExactEmails = respExact?.getList("emails")
-            val respExactCircles = respExact?.takeIf { it.containsKey("circles") }?.getList("circles")
+            val respExactCircles =
+                respExact?.takeIf { it.containsKey("circles") }?.getList("circles")
             val respExactRooms = respExact?.takeIf { it.containsKey("rooms") }?.getList("rooms")
 
             val respPartialUsers = respData?.getList("users")
             val respPartialGroups = respData?.getList("groups")
             val respPartialRemotes = respData?.getList("remotes")
-            val respPartialCircles = respData?.takeIf { it.containsKey("circles") }?.getList("circles")
+            val respPartialCircles =
+                respData?.takeIf { it.containsKey("circles") }?.getList("circles")
             val respPartialRooms = respData?.takeIf { it.containsKey("rooms") }?.getList("rooms")
 
             val jsonResults = listOfNotNull(
@@ -202,16 +223,6 @@ class ShareRepository(private val applicationContext: Context, private val accou
         )
     }
 
-    private fun getExpirationDate(chosenExpDateInMills: Long): String? {
-        if (chosenExpDateInMills == -1L) {
-            return null
-        }
-
-        return Date(chosenExpDateInMills).toExpirationDateString()
-    }
-
-    fun getCapabilities(): Capabilities = notesRepository.capabilities
-
     fun getShares(remoteId: Long): List<OCShare>? {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.getShares(remoteId)
@@ -219,7 +230,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
 
         return try {
             if (response.isSuccessful) {
-                val result = response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
+                val result =
+                    response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
                 result.toOCShare()
             } else {
                 Log_OC.d(tag, "Failed to getShares: ${response.errorBody()?.string()}")
@@ -233,7 +245,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
 
     fun sendEmail(shareId: Long, requestBody: SharePasswordRequest): Boolean {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
-        val call = shareAPI.sendEmail(shareId , requestBody)
+        val call = shareAPI.sendEmail(shareId, requestBody)
         val response = call.execute()
 
         return try {
@@ -309,7 +321,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
             response.isSuccessful
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while updating share", e)
-           false
+            false
         }
     }
 
@@ -331,7 +343,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val notesSuffix = notesPathResponseResult.fileSuffix
 
         val requestBody = CreateShareRequest(
-            path = "/" + notesPath + "/" + note.title + notesSuffix,
+            path = StringConstants.PATH + notesPath + StringConstants.PATH + note.title + notesSuffix,
             shareType = shareType.value,
             shareWith = shareWith,
             publicUpload = publicUpload,
@@ -343,7 +355,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.addShare(request = requestBody)
         val response = call.execute()
-        val defaultErrorMessage = applicationContext.getString(R.string.note_share_activity_cannot_created)
+        val defaultErrorMessage =
+            applicationContext.getString(R.string.note_share_activity_cannot_created)
 
         return try {
             if (response.isSuccessful) {
@@ -385,4 +398,5 @@ class ShareRepository(private val applicationContext: Context, private val accou
             false
         }
     }
+    // endregion
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/StringConstants.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/StringConstants.kt
new file mode 100644
index 000000000..305da7ca4
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/StringConstants.kt
@@ -0,0 +1,5 @@
+package it.niedermann.owncloud.notes.shared.util
+
+object StringConstants {
+    const val PATH = "/"
+}

From e99b6f8a3e45726b985e143f7085016d6fe4e182 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 10:06:13 +0200
Subject: [PATCH 128/138] use api result

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/persistence/ApiResult.kt   |  9 ++
 .../notes/share/NoteShareActivity.java        | 86 +++++++++++--------
 .../notes/share/NoteShareDetailActivity.kt    |  9 +-
 .../notes/share/repository/ShareRepository.kt | 44 ++++++----
 4 files changed, 93 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiResult.kt

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiResult.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiResult.kt
new file mode 100644
index 000000000..2f30ed4ac
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiResult.kt
@@ -0,0 +1,9 @@
+package it.niedermann.owncloud.notes.persistence
+
+sealed class ApiResult<out T> {
+    data class Success<out T>(val data: T, val message: String? = null) : ApiResult<T>()
+    data class Error(val message: String, val code: Int? = null) : ApiResult<Nothing>()
+}
+
+fun <T> ApiResult<T>.isSuccess(): Boolean = this is ApiResult.Success<T>
+fun <T> ApiResult<T>.isError(): Boolean = this is ApiResult.Error
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 1b21f0b01..ff3b288dc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -48,6 +48,8 @@
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareBinding;
 import it.niedermann.owncloud.notes.main.MainActivity;
+import it.niedermann.owncloud.notes.persistence.ApiResult;
+import it.niedermann.owncloud.notes.persistence.ApiResultKt;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.share.adapter.ShareeListAdapter;
@@ -60,9 +62,11 @@
 import it.niedermann.owncloud.notes.share.helper.UsersAndGroupsSearchProvider;
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
+import it.niedermann.owncloud.notes.share.model.CreateShareResponse;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
+import it.niedermann.owncloud.notes.shared.model.OcsResponse;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil;
@@ -331,16 +335,17 @@ public void createPublicShareLink() {
         } else {
             executorService.submit(() -> {
                 final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
-                if (result != null) {
-                    final var message = result.getSecond();
-                    DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
+                runOnUiThread(() -> {
+                    if (result instanceof ApiResult.Success<OcsResponse<CreateShareResponse>> successResponse) {
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, successResponse.getMessage());
 
-                    if (result.getFirst()) {
                         note.setIsShared(true);
                         repository.updateNote(note);
-                        runOnUiThread(this::recreate);
+                        runOnUiThread(NoteShareActivity.this::recreate);
+                    } else if (result instanceof ApiResult.Error errorResponse) {
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, errorResponse.getMessage());
                     }
-                }
+                });
             });
         }
     }
@@ -363,14 +368,14 @@ private void showShareLinkDialog(String link) {
         intentToShareLink.setType("text/plain");
         intentToShareLink.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.note_share_activity_subject_shared_with_you, note.getTitle()));
 
-        String[] packagesToExclude = new String[] { this.getPackageName() };
+        String[] packagesToExclude = new String[]{this.getPackageName()};
         DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
         chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
     }
 
     private String createInternalLink() {
         Uri baseUri = Uri.parse(account.getUrl());
-        return baseUri + "/index.php/f/" +  note.getRemoteId();
+        return baseUri + "/index.php/f/" + note.getRemoteId();
     }
 
     @Override
@@ -642,7 +647,15 @@ private boolean getExpDateShown() {
 
     @Override
     public void onQuickPermissionChanged(OCShare share, int permission) {
-       repository.updateSharePermission(share.getId(), permission);
+        executorService.submit(() -> {
+            final var result = repository.updateSharePermission(share.getId(), permission);
+
+            runOnUiThread(() -> {
+                if (result instanceof ApiResult.Error error) {
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
+                }
+            });
+        });
     }
 
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
@@ -711,13 +724,11 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
             );
 
             runOnUiThread(() -> {
-                if (result != null) {
-                    final var message = result.getSecond();
-                    DisplayUtils.showSnackMessage(NoteShareActivity.this, message);
-
-                    if (result.getFirst()) {
-                        NoteShareActivity.this.recreate();
-                    }
+                if (ApiResultKt.isSuccess(result)) {
+                    NoteShareActivity.this.recreate();
+                } else if (ApiResultKt.isError(result)) {
+                    ApiResult.Error error = (ApiResult.Error) result;
+                    DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
                 }
             });
         });
@@ -730,26 +741,29 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
             return;
         }
 
-        executorService.submit(() -> {{
-            final var requestBody = repository.getUpdateShareRequest(false,
-                    share,
-                    "",
-                    password,
-                    false,
-                    -1,
-                    repository.getCapabilities().getDefaultPermission()
-            );
-            final var success = repository.updateShare(share.getId(), requestBody);
+        executorService.submit(() -> {
+            {
+                final var requestBody = repository.getUpdateShareRequest(false,
+                        share,
+                        "",
+                        password,
+                        false,
+                        -1,
+                        repository.getCapabilities().getDefaultPermission()
+                );
+                final var result = repository.updateShare(share.getId(), requestBody);
 
-            runOnUiThread(() -> {
-                if (success) {
-                    final var intent = new Intent(NoteShareActivity.this, MainActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    NoteShareActivity.this.startActivity(intent);
-                } else {
-                    DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.note_share_detail_activity_create_share_error));
-                }
-            });
-        }});
+                runOnUiThread(() -> {
+                    if (ApiResultKt.isSuccess(result)) {
+                        final var intent = new Intent(NoteShareActivity.this, MainActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                        NoteShareActivity.this.startActivity(intent);
+                    } else if (ApiResultKt.isError(result)) {
+                        ApiResult.Error error = (ApiResult.Error) result;
+                        DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
+                    }
+                });
+            }
+        });
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 5123a70b4..549915313 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -18,6 +18,7 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
 import it.niedermann.owncloud.notes.main.MainActivity
 import it.niedermann.owncloud.notes.persistence.entity.Note
+import it.niedermann.owncloud.notes.persistence.isSuccess
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
@@ -544,11 +545,11 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         val updateShareResult = repository.updateShare(share!!.id, requestBody)
 
-        if (updateShareResult && sendEmail) {
+        if (updateShareResult.isSuccess() && sendEmail) {
             val sendEmailResult = repository.sendEmail(share!!.id, SharePasswordRequest(password))
             handleResult(sendEmailResult)
         } else {
-            handleResult(updateShareResult)
+            handleResult(updateShareResult.isSuccess())
         }
 
         if (!sendEmail) {
@@ -576,11 +577,11 @@ class NoteShareDetailActivity : BrandedActivity(),
             noteText
         )
 
-        if (result != null && result.first) {
+        if (result.isSuccess()) {
             repository.getSharesForNotesAndSaveShareEntities()
         }
 
-        handleResult(result != null && result.first)
+        handleResult(result.isSuccess())
     }
 
     private suspend fun handleResult(success: Boolean) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index e1a3f11b8..6d27da7e1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -9,10 +9,12 @@ import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
 import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.persistence.ApiProvider
+import it.niedermann.owncloud.notes.persistence.ApiResult
 import it.niedermann.owncloud.notes.persistence.NotesRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 import it.niedermann.owncloud.notes.share.model.CreateShareRequest
+import it.niedermann.owncloud.notes.share.model.CreateShareResponse
 import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
 import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
@@ -22,6 +24,7 @@ import it.niedermann.owncloud.notes.share.model.toOCShare
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
+import it.niedermann.owncloud.notes.shared.model.OcsResponse
 import it.niedermann.owncloud.notes.shared.util.StringConstants
 import it.niedermann.owncloud.notes.shared.util.extensions.getErrorMessage
 import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateString
@@ -307,21 +310,27 @@ class ShareRepository(
         }
     }
 
-    fun updateShare(shareId: Long, requestBody: UpdateShareRequest): Boolean {
+    fun updateShare(
+        shareId: Long,
+        requestBody: UpdateShareRequest
+    ): ApiResult<OcsResponse<CreateShareResponse>?> {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.updateShare(shareId, requestBody)
         val response = call.execute()
         return try {
             if (response.isSuccessful) {
                 Log_OC.d(tag, "Share updated successfully: ${response.body().toString()}")
+                ApiResult.Success(
+                    data = response.body(),
+                    message = applicationContext.getString(R.string.note_share_created)
+                )
             } else {
                 Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
+                ApiResult.Error(message = response.getErrorMessage() ?: "")
             }
-
-            response.isSuccessful
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while updating share", e)
-            false
+            ApiResult.Error(message = e.message ?: "")
         }
     }
 
@@ -335,10 +344,13 @@ class ShareRepository(
         password: String = "",
         permissions: Int = 0,
         shareNote: String = ""
-    ): Pair<Boolean, String>? {
+    ): ApiResult<OcsResponse<CreateShareResponse>?> {
+        val defaultErrorMessage =
+            applicationContext.getString(R.string.note_share_activity_cannot_created)
         val notesPathCall = notesRepository.getServerSettings(account, ApiVersion.API_VERSION_1_0)
         val notesPathResponse = notesPathCall.execute()
-        val notesPathResponseResult = notesPathResponse.body() ?: return null
+        val notesPathResponseResult =
+            notesPathResponse.body() ?: return ApiResult.Error(message = defaultErrorMessage)
         val notesPath = notesPathResponseResult.notesPath
         val notesSuffix = notesPathResponseResult.fileSuffix
 
@@ -355,32 +367,33 @@ class ShareRepository(
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val call = shareAPI.addShare(request = requestBody)
         val response = call.execute()
-        val defaultErrorMessage =
-            applicationContext.getString(R.string.note_share_activity_cannot_created)
 
         return try {
             if (response.isSuccessful) {
                 val createShareResponse = response.body()
                 Log_OC.d(tag, "Response successful: $createShareResponse")
-                true to applicationContext.getString(R.string.note_share_created)
+                ApiResult.Success(
+                    data = createShareResponse,
+                    message = applicationContext.getString(R.string.note_share_created)
+                )
             } else {
                 val errorMessage = response.getErrorMessage()
                 if (errorMessage == null) {
-                    return false to defaultErrorMessage
+                    return ApiResult.Error(message = defaultErrorMessage)
                 }
                 Log_OC.d(tag, "Response failed: $errorMessage")
-                false to errorMessage
+                ApiResult.Error(message = errorMessage)
             }
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while creating share", e)
-            false to defaultErrorMessage
+            ApiResult.Error(message = defaultErrorMessage)
         }
     }
 
     fun updateSharePermission(
         shareId: Long,
         permissions: Int? = null,
-    ): Boolean {
+    ): ApiResult<OcsResponse<CreateShareResponse>?> {
         val shareAPI = apiProvider.getShareAPI(applicationContext, account)
         val requestBody = UpdateSharePermissionRequest(permissions = permissions)
 
@@ -389,13 +402,14 @@ class ShareRepository(
             val response = call.execute()
             if (response.isSuccessful) {
                 Log_OC.d(tag, "Share updated successfully: ${response.body()}")
+                ApiResult.Success(response.body())
             } else {
                 Log_OC.d(tag, "Failed to update share: ${response.errorBody()?.string()}")
+                ApiResult.Error(message = response.getErrorMessage() ?: "", code = null)
             }
-            response.isSuccessful
         } catch (e: Exception) {
             Log_OC.d(tag, "Exception while updating share", e)
-            false
+            ApiResult.Error(message = e.message ?: "", code = null)
         }
     }
     // endregion

From 6ab6c912cf562ad45eca3c4a9ff348a426deb6c6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 10:14:24 +0200
Subject: [PATCH 129/138] use share's permission

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index ff3b288dc..d24268798 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -749,7 +749,7 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
                         password,
                         false,
                         -1,
-                        repository.getCapabilities().getDefaultPermission()
+                        share.getPermissions()
                 );
                 final var result = repository.updateShare(share.getId(), requestBody);
 

From 3c5ef289705d1071a170bf0cb3eb657ef4bfb9cf Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 24 Apr 2025 10:18:10 +0200
Subject: [PATCH 130/138] use share's permission

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java | 3 ++-
 .../owncloud/notes/share/NoteShareDetailActivity.kt           | 4 ++--
 .../niedermann/owncloud/notes/shared/model/Capabilities.java  | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index d24268798..50ac61907 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -743,7 +743,8 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
 
         executorService.submit(() -> {
             {
-                final var requestBody = repository.getUpdateShareRequest(false,
+                final var requestBody = repository.getUpdateShareRequest(
+                        false,
                         share,
                         "",
                         password,
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 549915313..a9c6d0c01 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import androidx.lifecycle.lifecycleScope
-import com.google.gson.Gson
 import com.nextcloud.android.sso.helper.SingleAccountHelper
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -76,7 +75,6 @@ class NoteShareDetailActivity : BrandedActivity(),
 
     private var expirationDatePickerFragment: ExpirationDatePickerDialogFragment? = null
     private lateinit var repository: ShareRepository
-    private val gson = Gson()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -116,6 +114,8 @@ class NoteShareDetailActivity : BrandedActivity(),
                 implementClickEvents()
             }
         }
+
+        permission = repository.getCapabilities().defaultPermission
     }
 
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
index 21d7a806c..e7f1f98d2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java
@@ -13,6 +13,8 @@
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
+import com.owncloud.android.lib.resources.shares.OCShare;
+
 import java.io.Serializable;
 
 @Entity(tableName = "capabilities")
@@ -42,7 +44,7 @@ public class Capabilities implements Serializable {
     private boolean publicPasswordEnforced;
     private boolean askForOptionalPassword;
     private boolean isReSharingAllowed;
-    private int defaultPermission;
+    private int defaultPermission = OCShare.NO_PERMISSION;
 
     public boolean isReSharingAllowed() {
         return isReSharingAllowed;

From 34190428372083b1b82df48c1e8e32c15cdc22a5 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 28 Apr 2025 12:06:21 +0200
Subject: [PATCH 131/138] fix lateinit crash

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index a9c6d0c01..d6c612301 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -104,6 +104,7 @@ class NoteShareDetailActivity : BrandedActivity(),
             val ssoAcc =
                 SingleAccountHelper.getCurrentSingleSignOnAccount(this@NoteShareDetailActivity)
             repository = ShareRepository(this@NoteShareDetailActivity, ssoAcc)
+            permission = repository.getCapabilities().defaultPermission
 
             withContext(Dispatchers.Main) {
                 if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
@@ -114,8 +115,6 @@ class NoteShareDetailActivity : BrandedActivity(),
                 implementClickEvents()
             }
         }
-
-        permission = repository.getCapabilities().defaultPermission
     }
 
 

From 8677a778f6c350282a180c29718a8d22eaed0bcb Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 28 Apr 2025 12:29:59 +0200
Subject: [PATCH 132/138] reflect onQuickPermissionChanges

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java       | 10 ++++++----
 .../notes/share/adapter/ShareeListAdapter.java        | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 50ac61907..e830116e5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -432,11 +432,12 @@ public void refreshSharesFromDB() {
                     return;
                 }
 
-                adapter.getShares().clear();
+                // clear adapter
+                adapter.removeAll();
+                shares.clear();
 
                 // to show share with users/groups info
                 if (note != null) {
-
                     // get shares from local DB
                     final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
                     shareEntities.forEach(entity -> {
@@ -649,9 +650,10 @@ private boolean getExpDateShown() {
     public void onQuickPermissionChanged(OCShare share, int permission) {
         executorService.submit(() -> {
             final var result = repository.updateSharePermission(share.getId(), permission);
-
             runOnUiThread(() -> {
-                if (result instanceof ApiResult.Error error) {
+                if (ApiResultKt.isSuccess(result)) {
+                    NoteShareActivity.this.recreate();
+                } else if (result instanceof ApiResult.Error error) {
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
                 }
             });
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 28a4bf2c6..69dde41a9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -47,6 +47,7 @@ public ShareeListAdapter(Activity activity,
         this.account = account;
 
         sortShares();
+        setHasStableIds(true);
     }
 
     @Override
@@ -128,6 +129,10 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
     @Override
     public long getItemId(int position) {
+        if (position < 0 || position >= shares.size()) {
+            return 0;
+        }
+
         return shares.get(position).getId();
     }
 
@@ -156,6 +161,12 @@ public void remove(OCShare share) {
         notifyDataSetChanged();
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    public void removeAll() {
+        shares.clear();
+        notifyDataSetChanged();
+    }
+
     /**
      * sort all by creation time, then email/link shares on top
      */

From 40d42519954b9bd579c3ef016a169da2b2e0aa9d Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 28 Apr 2025 12:49:37 +0200
Subject: [PATCH 133/138] add updateShare

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 36 ++++++++++++++++---
 .../share/adapter/ShareeListAdapter.java      | 20 +++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e830116e5..13402098b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -131,7 +131,7 @@ private void initializeArguments() {
                         setupSearchView((SearchManager) getSystemService(Context.SEARCH_SERVICE), getComponentName());
                     }
 
-                    refreshSharesFromDB();
+                    updateShareeListAdapter();
                     binding.loadingLayout.setVisibility(View.GONE);
                 });
             } catch (Exception e) {
@@ -422,7 +422,7 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     public void showProfileBottomSheet(Account account, String shareWith) {
     }
 
-    public void refreshSharesFromDB() {
+    public void updateShareeListAdapter() {
         executorService.submit(() -> {
             try {
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
@@ -459,7 +459,7 @@ public void refreshSharesFromDB() {
                     setShareWithYou();
                 });
             } catch (Exception e) {
-                Log_OC.d(TAG, "Exception while refreshSharesFromDB: " + e);
+                Log_OC.d(TAG, "Exception while updateShareeListAdapter: " + e);
             }
         });
     }
@@ -652,7 +652,7 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
             final var result = repository.updateSharePermission(share.getId(), permission);
             runOnUiThread(() -> {
                 if (ApiResultKt.isSuccess(result)) {
-                    NoteShareActivity.this.recreate();
+                    updateShare(share);
                 } else if (result instanceof ApiResult.Error error) {
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
                 }
@@ -660,6 +660,34 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
         });
     }
 
+    private void updateShare(OCShare share) {
+        executorService.submit(() -> {
+            try {
+                final var updatedShares = repository.getShares(share.getId());
+
+                runOnUiThread(() -> {
+                    if (updatedShares != null && binding.sharesList.getAdapter() instanceof ShareeListAdapter adapter) {
+                        OCShare updatedShare = null;
+                        for (int i=0;i<updatedShares.size();i++) {
+                            if (updatedShares.get(i).getId() == share.getId()) {
+                                updatedShare = updatedShares.get(i);
+                                break;
+                            }
+                        }
+
+                        if (updatedShare == null) {
+                           return;
+                        }
+
+                        adapter.updateShare(updatedShare);
+                    }
+                });
+            } catch (Exception e) {
+                Log_OC.d(TAG, "Exception while refreshing share info: " + e);
+            }
+        });
+    }
+
     private final ActivityResultLauncher<String> requestContactPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
                 if (isGranted) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 69dde41a9..184d90846 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -167,6 +167,26 @@ public void removeAll() {
         notifyDataSetChanged();
     }
 
+    public void updateShare(OCShare updatedShare) {
+        if (updatedShare == null) {
+            return;
+        }
+
+        int indexToUpdate = -1;
+        for (int i = 0; i < getItemCount(); i++) {
+            final var share = shares.get(i);
+            if (share != null && share.getId() == updatedShare.getId()) {
+                indexToUpdate = i;
+                break;
+            }
+        }
+
+        if (indexToUpdate != -1) {
+            shares.set(indexToUpdate, updatedShare);
+            notifyItemChanged(indexToUpdate);
+        }
+    }
+
     /**
      * sort all by creation time, then email/link shares on top
      */

From 8189455c1914683c27515d13d20d609218207aa9 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 28 Apr 2025 12:59:23 +0200
Subject: [PATCH 134/138] add addShare

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        |  6 ++-
 .../share/adapter/ShareeListAdapter.java      |  9 ++--
 .../model/CreateShareResponseExtensions.kt    | 52 +++++++++++--------
 .../notes/share/repository/ShareRepository.kt |  6 +--
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 13402098b..299eca5d9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -63,6 +63,7 @@
 import it.niedermann.owncloud.notes.share.listener.NoteShareItemAction;
 import it.niedermann.owncloud.notes.share.listener.ShareeListAdapterListener;
 import it.niedermann.owncloud.notes.share.model.CreateShareResponse;
+import it.niedermann.owncloud.notes.share.model.CreateShareResponseExtensionsKt;
 import it.niedermann.owncloud.notes.share.model.UsersAndGroupsSearchConfig;
 import it.niedermann.owncloud.notes.share.repository.ShareRepository;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -754,8 +755,9 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
             );
 
             runOnUiThread(() -> {
-                if (ApiResultKt.isSuccess(result)) {
-                    NoteShareActivity.this.recreate();
+                if (result instanceof ApiResult.Success<OcsResponse<CreateShareResponse>> successResponse &&
+                        binding.sharesList.getAdapter() instanceof ShareeListAdapter adapter) {
+                    adapter.addShare(CreateShareResponseExtensionsKt.toOCShare(successResponse.getData().ocs.data));
                 } else if (ApiResultKt.isError(result)) {
                     ApiResult.Error error = (ApiResult.Error) result;
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index 184d90846..f234c4a11 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -167,11 +167,12 @@ public void removeAll() {
         notifyDataSetChanged();
     }
 
-    public void updateShare(OCShare updatedShare) {
-        if (updatedShare == null) {
-            return;
-        }
+    public void addShare(@NonNull OCShare newShare) {
+        shares.add(0, newShare);
+        notifyItemInserted(0);
+    }
 
+    public void updateShare(@NonNull OCShare updatedShare) {
         int indexToUpdate = -1;
         for (int i = 0; i < getItemCount(); i++) {
             final var share = shares.get(i);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
index 03bec35a7..0eb71c21a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/model/CreateShareResponseExtensions.kt
@@ -3,29 +3,35 @@ package it.niedermann.owncloud.notes.share.model
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
 
-fun List<CreateShareResponse>.toOCShare(): List<OCShare> {
+fun List<CreateShareResponse>.toOCShareList(): List<OCShare> {
     return map { response ->
-        OCShare().apply {
-            id = response.id.toLongOrNull() ?: -1L
-            fileSource = response.fileSource
-            itemSource = response.itemSource
-            shareType = ShareType.fromValue(response.shareType.toInt())
-            shareWith = response.shareWith
-            path = response.path
-            permissions = response.permissions.toInt()
-            sharedDate = response.stime
-            token = response.token
-            sharedWithDisplayName = response.shareWithDisplayname
-            isFolder = response.itemType == "folder"
-            userId = response.uidOwner
-            shareLink =  response.url
-            isPasswordProtected = !response.password.isNullOrEmpty()
-            note = response.note
-            isHideFileDownload = (response.hideDownload == 1L)
-            label = response.label
-            isHasPreview = response.hasPreview
-            mimetype = response.mimetype
-            ownerDisplayName = response.displaynameOwner
-        }
+        response.toOCShare()
     }.filter { it.id != -1L }
 }
+
+fun CreateShareResponse.toOCShare(): OCShare {
+    val response = this
+
+    return OCShare().apply {
+        id = response.id.toLongOrNull() ?: -1L
+        fileSource = response.fileSource
+        itemSource = response.itemSource
+        shareType = ShareType.fromValue(response.shareType.toInt())
+        shareWith = response.shareWith
+        path = response.path
+        permissions = response.permissions.toInt()
+        sharedDate = response.stime
+        token = response.token
+        sharedWithDisplayName = response.shareWithDisplayname
+        isFolder = response.itemType == "folder"
+        userId = response.uidOwner
+        shareLink =  response.url
+        isPasswordProtected = !response.password.isNullOrEmpty()
+        note = response.note
+        isHideFileDownload = (response.hideDownload == 1L)
+        label = response.label
+        isHasPreview = response.hasPreview
+        mimetype = response.mimetype
+        ownerDisplayName = response.displaynameOwner
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
index 6d27da7e1..2328b1552 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -20,7 +20,7 @@ import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
 import it.niedermann.owncloud.notes.share.model.UpdateSharePermissionRequest
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
-import it.niedermann.owncloud.notes.share.model.toOCShare
+import it.niedermann.owncloud.notes.share.model.toOCShareList
 import it.niedermann.owncloud.notes.shared.model.ApiVersion
 import it.niedermann.owncloud.notes.shared.model.Capabilities
 import it.niedermann.owncloud.notes.shared.model.NotesSettings
@@ -235,7 +235,7 @@ class ShareRepository(
             if (response.isSuccessful) {
                 val result =
                     response.body()?.ocs?.data ?: throw RuntimeException("No shares available")
-                result.toOCShare()
+                result.toOCShareList()
             } else {
                 Log_OC.d(tag, "Failed to getShares: ${response.errorBody()?.string()}")
                 null
@@ -274,7 +274,7 @@ class ShareRepository(
             if (response.isSuccessful) {
                 val body = response.body()
                 Log_OC.d(tag, "Response successful: $body")
-                body?.ocs?.data?.toOCShare()
+                body?.ocs?.data?.toOCShareList()
             } else {
                 val errorBody = response.errorBody()?.string()
                 Log_OC.d(tag, "Response failed: $errorBody")

From efaefaa851d62144fce223b9f99543a37c3ae817 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 28 Apr 2025 13:25:33 +0200
Subject: [PATCH 135/138] get rid of recreates

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/notes/share/NoteShareActivity.java           | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 299eca5d9..e46ee849b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -337,12 +337,11 @@ public void createPublicShareLink() {
             executorService.submit(() -> {
                 final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", "", 0, "");
                 runOnUiThread(() -> {
-                    if (result instanceof ApiResult.Success<OcsResponse<CreateShareResponse>> successResponse) {
+                    if (result instanceof ApiResult.Success<OcsResponse<CreateShareResponse>> successResponse && binding.sharesList.getAdapter() instanceof ShareeListAdapter adapter) {
                         DisplayUtils.showSnackMessage(NoteShareActivity.this, successResponse.getMessage());
-
                         note.setIsShared(true);
                         repository.updateNote(note);
-                        runOnUiThread(NoteShareActivity.this::recreate);
+                        adapter.addShare(CreateShareResponseExtensionsKt.toOCShare(successResponse.getData().ocs.data));
                     } else if (result instanceof ApiResult.Error errorResponse) {
                         DisplayUtils.showSnackMessage(NoteShareActivity.this, errorResponse.getMessage());
                     }
@@ -758,8 +757,7 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
                 if (result instanceof ApiResult.Success<OcsResponse<CreateShareResponse>> successResponse &&
                         binding.sharesList.getAdapter() instanceof ShareeListAdapter adapter) {
                     adapter.addShare(CreateShareResponseExtensionsKt.toOCShare(successResponse.getData().ocs.data));
-                } else if (ApiResultKt.isError(result)) {
-                    ApiResult.Error error = (ApiResult.Error) result;
+                } else if (result instanceof ApiResult.Error error) {
                     DisplayUtils.showSnackMessage(NoteShareActivity.this, error.getMessage());
                 }
             });

From b2dd4ba025bffd2b9864f5c5f4393abdc3a0f862 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 29 Apr 2025 10:44:32 +0200
Subject: [PATCH 136/138] fix search

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index e46ee849b..f4f1fdafb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -144,7 +144,9 @@ private void initializeArguments() {
     @Override
     public void onStart() {
         super.onStart();
-        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(true);
+
+        // note cannot be encrypted - logic ported from files app
+        UsersAndGroupsSearchConfig.INSTANCE.setSearchOnlyUsers(false);
     }
 
     @Override
@@ -202,43 +204,47 @@ public boolean onQueryTextSubmit(String query) {
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                binding.progressBar.setVisibility(View.VISIBLE);
-
-                // Cancel the previous task if it's still running
-                if (future != null && !future.isDone()) {
-                    future.cancel(true);
-                }
+                if (!newText.isEmpty()) {
+                    binding.progressBar.setVisibility(View.VISIBLE);
 
-                // Schedule a new task with a delay
-                future = executorService.schedule(() -> {
-                    if (capabilities == null) {
-                        Log_OC.d(TAG, "Capabilities cannot be null");
-                        return;
+                    // Cancel the previous task if it's still running
+                    if (future != null && !future.isDone()) {
+                        future.cancel(true);
                     }
 
-                    final var isFederationShareAllowed = capabilities.getFederationShare();
-                    try {
-                        var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed);
-
-                        if (cursor == null || cursor.getCount() == 0) {
+                    // Schedule a new task with a delay
+                    future = executorService.schedule(() -> {
+                        if (capabilities == null) {
+                            Log_OC.d(TAG, "Capabilities cannot be null");
                             return;
                         }
 
-                        runOnUiThread(() -> {
-                            if (binding.searchView.getVisibility() == View.VISIBLE) {
-                                suggestionAdapter.swapCursor(cursor);
+                        final var isFederationShareAllowed = capabilities.getFederationShare();
+                        try {
+                            var cursor = provider.searchForUsersOrGroups(newText, isFederationShareAllowed);
+
+                            if (cursor == null || cursor.getCount() == 0) {
+                                return;
                             }
 
-                            binding.progressBar.setVisibility(View.GONE);
-                        });
+                            runOnUiThread(() -> {
+                                if (binding.searchView.getVisibility() == View.VISIBLE) {
+                                    suggestionAdapter.swapCursor(cursor);
+                                }
 
-                    } catch (Exception e) {
-                        Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
-                        runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
-                    }
+                                binding.progressBar.setVisibility(View.GONE);
+                            });
 
-                }, SEARCH_DELAY_MS, TimeUnit.MILLISECONDS);
+                        } catch (Exception e) {
+                            Log_OC.d(TAG, "Exception setupSearchView.onQueryTextChange: " + e);
+                            runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
+                        }
 
+                    }, SEARCH_DELAY_MS, TimeUnit.MILLISECONDS);
+                } else {
+                    binding.progressBar.setVisibility(View.GONE);
+                    suggestionAdapter.swapCursor(null);
+                }
                 return false;
             }
         });

From 95bd32d2135a0f23932cac49b14106873ac21961 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 29 Apr 2025 11:18:33 +0200
Subject: [PATCH 137/138] redirect to share activity after add new share

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../notes/share/NoteShareActivity.java        | 96 ++++++++++++++-----
 .../notes/share/NoteShareDetailActivity.kt    |  9 +-
 2 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index f4f1fdafb..a27dd5b24 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -17,6 +17,7 @@
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
@@ -36,6 +37,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -89,7 +91,8 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private Account account;
     private ShareRepository repository;
     private Capabilities capabilities;
-    private final List<OCShare> shares = new ArrayList<>();
+    private ActivityResultLauncher<Intent> resultLauncher;
+    private final List<OCShare> shares = Collections.synchronizedList(new ArrayList<>());
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -97,16 +100,42 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         executorService = Executors.newSingleThreadScheduledExecutor();
         binding = ActivityNoteShareBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
+        registerResultLauncher();
         initializeArguments();
+        initializeOnBackPressedDispatcher();
+    }
+
+    private void registerResultLauncher() {
+        resultLauncher = registerForActivityResult(
+                new ActivityResultContracts.StartActivityForResult(),
+                result -> {
+                    if (result.getResultCode() == RESULT_OK && result.getData() != null) {
+                        recreate();
+                    }
+                });
+    }
+
+    private void initializeOnBackPressedDispatcher() {
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                Intent intent = new Intent(NoteShareActivity.this, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
     private void initializeArguments() {
         Bundle bundler = getIntent().getExtras();
         note = BundleExtensionsKt.getSerializableArgument(bundler, ARG_NOTE, Note.class);
         account = BundleExtensionsKt.getSerializableArgument(bundler, ARG_ACCOUNT, Account.class);
+
         if (note == null) {
             throw new IllegalArgumentException("Note cannot be null");
         }
+
         if (account == null) {
             throw new IllegalArgumentException("Account cannot be null");
         }
@@ -280,7 +309,7 @@ private void navigateNoteShareDetail(String shareWith, int shareType) {
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
-        startActivity(intent);
+        resultLauncher.launch(intent);
     }
 
     private boolean accountOwnsFile() {
@@ -428,41 +457,44 @@ public void requestPasswordForShare(OCShare share, boolean askForPassword) {
     public void showProfileBottomSheet(Account account, String shareWith) {
     }
 
+    private boolean isInitializingShares = false;
+
     public void updateShareeListAdapter() {
+        if (isInitializingShares) {
+            Log_OC.d(TAG, "Shares initialization already in progress");
+            return;
+        }
+
+        isInitializingShares = true;
+
         executorService.submit(() -> {
             try {
                 ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();
 
                 if (adapter == null) {
                     runOnUiThread(() -> DisplayUtils.showSnackMessage(NoteShareActivity.this, getString(R.string.could_not_retrieve_shares)));
+                    isInitializingShares = false;
                     return;
                 }
 
-                // clear adapter
-                adapter.removeAll();
-                shares.clear();
+                List<OCShare> tempShares = new ArrayList<>();
 
                 // to show share with users/groups info
                 if (note != null) {
                     // get shares from local DB
-                    final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
-                    shareEntities.forEach(entity -> {
-                        if (entity.getId() != null) {
-                            addShares(entity.getId());
-                        }
-                    });
-
-                    // get shares from remote
-                    final var shares = repository.getShareFromNote(note);
-                    if (shares != null) {
-                        shares.forEach(entity -> addShares(entity.getId()));
-                    }
+                    populateSharesList(tempShares);
                 }
 
                 runOnUiThread(() -> {
+                    shares.clear();
+                    shares.addAll(tempShares);
+
+                    adapter.removeAll();
                     adapter.addShares(shares);
                     addPublicShares(adapter);
                     setShareWithYou();
+
+                    isInitializingShares = false;
                 });
             } catch (Exception e) {
                 Log_OC.d(TAG, "Exception while updateShareeListAdapter: " + e);
@@ -470,14 +502,32 @@ public void updateShareeListAdapter() {
         });
     }
 
-    private void addShares(long id) {
+    private void populateSharesList(List<OCShare> targetList) {
+        // Get shares from local DB
+        final var shareEntities = repository.getShareEntitiesForSpecificNote(note);
+        for (var entity : shareEntities) {
+            if (entity.getId() != null) {
+                addSharesToList(entity.getId(), targetList);
+            }
+        }
+
+        // Get shares from remote
+        final var remoteShares = repository.getShareFromNote(note);
+        if (remoteShares != null) {
+            for (var entity : remoteShares) {
+                addSharesToList(entity.getId(), targetList);
+            }
+        }
+    }
+
+    private void addSharesToList(long id, List<OCShare> targetList) {
         final var result = repository.getShares(id);
         if (result != null) {
-            result.forEach(ocShare -> {
-                if (!shares.contains(ocShare)) {
-                    shares.add(ocShare);
+            for (OCShare ocShare : result) {
+                if (!targetList.contains(ocShare)) {
+                    targetList.add(ocShare);
                 }
-            });
+            }
         }
     }
 
@@ -629,7 +679,7 @@ private void modifyExistingShare(OCShare share, int screenTypePermission) {
 
         Intent intent = new Intent(this, NoteShareDetailActivity.class);
         intent.putExtras(bundle);
-        startActivity(intent);
+        resultLauncher.launch(intent);
     }
 
     private boolean getExpDateShown() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index d6c612301..bfa39fd43 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -15,7 +15,6 @@ import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.branding.BrandedActivity
 import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ActivityNoteShareDetailBinding
-import it.niedermann.owncloud.notes.main.MainActivity
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.persistence.isSuccess
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
@@ -586,11 +585,9 @@ class NoteShareDetailActivity : BrandedActivity(),
     private suspend fun handleResult(success: Boolean) {
         withContext(Dispatchers.Main) {
             if (success) {
-                Intent(this@NoteShareDetailActivity, MainActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                }.also {
-                    startActivity(it)
-                }
+                val resultIntent = Intent()
+                setResult(RESULT_OK, resultIntent)
+                finish()
             } else {
                 DisplayUtils.showSnackMessage(
                     this@NoteShareDetailActivity,

From 1af63dff7357d853d37e0352e52324853e2f3e69 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 5 May 2025 14:59:51 +0200
Subject: [PATCH 138/138] fix unit test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../notes/persistence/entity/Note.java        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
index 010493abf..dabd3bd51 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
@@ -107,6 +107,19 @@ public Note() {
         super();
     }
 
+    @Ignore
+    public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag) {
+        this(remoteId,
+             modified,
+             title,
+             content,
+             category,
+             favorite,
+             eTag,
+             false,
+             false);
+    }
+    
     @Ignore
     public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String eTag, boolean isShared, boolean readonly) {
         this.remoteId = remoteId;
@@ -119,6 +132,16 @@ public Note(@Nullable Long remoteId, @Nullable Calendar modified, @NonNull Strin
         this.isShared = isShared;
     }
 
+    @Ignore
+    public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY) {
+        this(remoteId, modified, title, content, category, favorite, etag, false, false);
+        this.id = id;
+        this.status = status;
+        this.accountId = accountId;
+        this.excerpt = excerpt;
+        this.scrollY = scrollY;
+    }
+
     @Ignore
     public Note(long id, @Nullable Long remoteId, @Nullable Calendar modified, @NonNull String title, @NonNull String content, @NonNull String category, boolean favorite, @Nullable String etag, @NonNull DBStatus status, long accountId, @NonNull String excerpt, int scrollY, boolean isShared, boolean readonly) {
         this(remoteId, modified, title, content, category, favorite, etag, isShared, readonly);
@@ -308,4 +331,4 @@ public String toString() {
                 ", scrollY=" + scrollY +
                 '}';
     }
-}
\ No newline at end of file
+}