extract non-repository logic

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

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)

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