Feature - Share Functionality

app/build.gradle

@@ -95,6 +95,15 @@ ext {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
+    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:48ed8e86d9'
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'

app/src/main/AndroidManifest.xml

@@ -11,7 +11,8 @@
 
     <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" />
@@ -47,10 +48,22 @@
                 android:value=".android.activity.NotesListViewActivity" />
         </activity>
 
+        <activity
+            android:name=".share.NoteShareActivity" />
+
+        <activity
+            android:name=".share.NoteShareDetailActivity" />
+
         <activity
             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"

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 -> {

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);
     }

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)
+    }
+}

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)
+    }
+}

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, false);
                                 requireActivity().runOnUiThread(() -> onNoteLoaded(note));
                                 requireActivity().invalidateOptionsMenu();
                             }

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, false);
         fragment = getNewNoteFragment(newNote);
         replaceFragment();
     }

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;
@@ -517,7 +518,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()) {

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;
@@ -31,6 +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.NoteShareActivity;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 
 public class MultiSelectedActionModeCallback implements Callback {
@@ -53,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,
@@ -63,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;
@@ -153,16 +160,26 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             }
             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));
-                }
-            });
+            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));
+                        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 {
+                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();

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) -> {

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;
 
@@ -29,8 +30,10 @@
 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 okhttp3.ResponseBody;
 import retrofit2.NextcloudRetrofitApiBuilder;
 import retrofit2.Retrofit;
 
@@ -47,12 +50,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,13 +101,23 @@ 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);
         } else {
             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) -> {

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());

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java

@@ -17,15 +17,18 @@
 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;
 import it.niedermann.owncloud.notes.persistence.dao.WidgetNotesListDao;
 import it.niedermann.owncloud.notes.persistence.dao.WidgetSingleNoteDao;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.CategoryOptions;
 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;
@@ -43,15 +46,18 @@
 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 = {
                 Account.class,
                 Note.class,
                 CategoryOptions.class,
                 SingleNoteWidgetData.class,
-                NotesListWidgetData.class
-        }, version = 25
+                NotesListWidgetData.class,
+                ShareEntity.class,
+                Capabilities.class
+        }, version = 26
 )
 @TypeConverters({Converters.class})
 public abstract class NotesDatabase extends RoomDatabase {
@@ -115,4 +121,8 @@ public void onCreate(@NonNull SupportSQLiteDatabase db) {
     public abstract WidgetSingleNoteDao getWidgetSingleNoteDao();
 
     public abstract WidgetNotesListDao getWidgetNotesListDao();
+
+    public abstract ShareDao getShareDao();
+
+    public abstract CapabilitiesDao getCapabilitiesDao();
 }