Implementation of:

.gitignore

@@ -40,3 +40,6 @@ hs_err_pid*
 .externalNativeBuild
 fastlane/.env.staging
 fastlane/.env.production
+
+# Kotlin compiler cache
+.kotlin/

app/src/main/java/org/permanent/permanent/models/AccessRole.kt

@@ -3,7 +3,7 @@ package org.permanent.permanent.models
 import android.os.Parcel
 import android.os.Parcelable
 import org.permanent.permanent.ArchivePermission
-import java.util.*
+import java.util.Locale
 
 enum class AccessRole(val backendString: String) : Parcelable {
     OWNER("access.role.owner") {
@@ -113,7 +113,7 @@ enum class AccessRole(val backendString: String) : Parcelable {
     fun toTitleCase(): String = this.name.lowercase(Locale.getDefault())
         .replaceFirstChar { it.titlecase(Locale.getDefault()) }
 
-    fun toLowerCase(): String = this.name.lowercase(Locale.getDefault())
+    fun lowerCase(): String = this.name.lowercase(Locale.getDefault())
 
     fun getInferior(otherAccessRole: AccessRole): AccessRole {
         return if (otherAccessRole in inferiors()) otherAccessRole else this
@@ -153,7 +153,7 @@ enum class AccessRole(val backendString: String) : Parcelable {
             return values()[parcel.readInt()]
         }
 
-        fun createFromBackendString(accessRoleString: String?): AccessRole {
+        fun fromBackendValue(accessRoleString: String?): AccessRole {
             return when (accessRoleString) {
                 OWNER.backendString -> OWNER
                 MANAGER.backendString -> MANAGER
@@ -164,6 +164,17 @@ enum class AccessRole(val backendString: String) : Parcelable {
             }
         }
 
+        fun fromStelaBackendValue(accessRoleString: String?): AccessRole {
+            return when (accessRoleString) {
+                OWNER.lowerCase() -> OWNER
+                MANAGER.lowerCase() -> MANAGER
+                CURATOR.lowerCase() -> CURATOR
+                EDITOR.lowerCase() -> EDITOR
+                CONTRIBUTOR.lowerCase() -> CONTRIBUTOR
+                else -> VIEWER
+            }
+        }
+
         override fun newArray(size: Int): Array<AccessRole?> {
             return arrayOfNulls(size)
         }

app/src/main/java/org/permanent/permanent/models/Record.kt

@@ -83,7 +83,7 @@ open class Record : Parcelable {
         isThumbBlurred = false
         type = if (recordInfo.folderId != null) RecordType.FOLDER else RecordType.FILE
         size = recordInfo.size ?: -1L
-        accessRole = AccessRole.createFromBackendString(recordInfo.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordInfo.accessRole)
         initShares(recordInfo.ShareVOs)
         displayFirstInCarousel = false
         val thumbStatus = ThumbStatus.createFromBackendString(recordInfo.thumbStatus)
@@ -109,7 +109,7 @@ open class Record : Parcelable {
         thumbURL2000 = recordInfo.thumbURL2000
         isThumbBlurred = false
         type = RecordType.FOLDER
-        accessRole = AccessRole.createFromBackendString(recordInfo.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordInfo.accessRole)
         initShares(recordInfo.ShareVOs)
         displayFirstInCarousel = false
         val thumbStatus = ThumbStatus.createFromBackendString(recordInfo.thumbStatus)
@@ -138,7 +138,7 @@ open class Record : Parcelable {
         thumbURL2000 = itemVO.thumbURL2000
         isThumbBlurred = false
         type = if (itemVO.folderId != null) RecordType.FOLDER else RecordType.FILE
-        accessRole = AccessRole.createFromBackendString(itemVO.accessRole)
+        accessRole = AccessRole.fromBackendValue(itemVO.accessRole)
         initShares(itemVO.ShareVOs)
         displayFirstInCarousel = false
         isProcessing = itemVO.thumbURL200.isNullOrEmpty()

app/src/main/java/org/permanent/permanent/network/NetworkClient.kt

@@ -19,6 +19,7 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
+import org.json.JSONObject
 import org.permanent.permanent.BuildConfig
 import org.permanent.permanent.Constants
 import org.permanent.permanent.PermanentApplication
@@ -58,7 +59,6 @@ import org.permanent.permanent.ui.myFiles.upload.CountingRequestListener
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.Query
 import java.io.File
 import java.util.Date
 
@@ -788,10 +788,30 @@ class NetworkClient(private var okHttpClient: OkHttpClient?, context: Context) {
 
     fun disableTwoFactor(twoFAVO: TwoFAVO): Call<ResponseBody> = stelaAccountService.disableTwoFactor(twoFAVO)
 
-    fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?): Call<ShareLinkVOResponse> = stelaAccountService.getShareLink(shareTokens,shareLinkIds)
+    fun getShareLink(shareLinkIds: List<Int>): Call<ShareLinkVOResponse> = stelaAccountService.getShareLink(shareLinkIds)
 
     fun generateShareLink(shareLink: ShareLinkVO): Call<ShareLinkResponse> = stelaAccountService.generateShareLink(shareLink)
 
+    fun updateShareLink(shareLink: ShareLinkVO): Call<ResponseVO> {
+        val json = JSONObject()
+
+        shareLink.permissionsLevel?.let { json.put("permissionsLevel", it) }
+        shareLink.accessRestrictions?.let { json.put("accessRestrictions", it) }
+        if (shareLink.expirationTimestamp == null) {
+            json.put("expirationTimestamp", JSONObject.NULL)
+        } else {
+            json.put("expirationTimestamp", shareLink.expirationTimestamp)
+        }
+        val body = json.toString()
+            .toRequestBody("application/json; charset=utf-8".toMediaType())
+
+        return stelaAccountService.updateShareLink(shareLink.id, body)
+    }
+
+    fun deleteShareLink(shareLinkId: String): Call<ResponseVO> {
+        return stelaAccountService.deleteShareLink(shareLinkId)
+    }
+
     fun getPaymentIntent(
         accountId: Int,
         accountEmail: String?,

app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt

@@ -10,21 +10,28 @@ import org.permanent.permanent.network.models.ShareLinkVOResponse
 import org.permanent.permanent.network.models.TwoFAVO
 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
 import retrofit2.http.Query
 
 interface StelaAccountService {
 
     @GET("api/v2/share-links")
-    fun getShareLink(@Query("shareTokens[]") shareTokens: List<String>?,
-                     @Query("shareLinkIds[]") shareLinkIds: List<String>?
-    ): Call<ShareLinkVOResponse>
+    fun getShareLink(@Query("shareLinkIds[]") shareLinkIds: List<Int>): Call<ShareLinkVOResponse>
 
     @POST("api/v2/share-links")
     fun generateShareLink(@Body shareLink: ShareLinkVO): Call<ShareLinkResponse>
 
+    @PATCH("api/v2/share-links/{shareLinkId}")
+    fun updateShareLink(@Path("shareLinkId") shareLinkId: String?,  @Body body: RequestBody): Call<ResponseVO>
+
+    @DELETE("api/v2/share-links/{shareLinkId}")
+    fun deleteShareLink(@Path("shareLinkId") shareLinkId: String?): Call<ResponseVO>
+
     @PUT("api/v2/account/tags")
     fun addRemoveTags(@Body tags: Tags): Call<ResponseVO>
 

app/src/main/java/org/permanent/permanent/network/models/Datum.kt

@@ -20,4 +20,6 @@ class Datum {
     var TagVO: TagVO? = null
     var TagLinkVO: TagLinkVO? = null
     var PromoVO: PromoVO? = null
+    var ShareLinkVO: ShareLinkVO? = null
+
 }

app/src/main/java/org/permanent/permanent/network/models/FileData.kt

@@ -38,7 +38,7 @@ class FileData private constructor() : Parcelable {
         folderLinkId = recordVO.folder_linkId ?: -1
         archiveId = recordVO.archiveId ?: -1
         archiveNr = recordVO.archiveNbr
-        accessRole = AccessRole.createFromBackendString(recordVO.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordVO.accessRole)
         val fileVOs = recordVO.FileVOs ?: emptyList()
 
         val fileVO: FileVO? = when {

app/src/main/java/org/permanent/permanent/network/models/ResponseVO.kt

@@ -85,4 +85,8 @@ class ResponseVO {
     fun getPromoVO(): PromoVO? {
         return getData()?.get(0)?.PromoVO
     }
+
+    fun getShareLinkVO(): ShareLinkVO? {
+        return getData()?.get(0)?.ShareLinkVO
+    }
 }

app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt

@@ -8,20 +8,20 @@ data class ShareLinkVOResponse(
 data class ShareLinkResponse(
     val data: ShareLinkVO
 )
-class ShareLinkVO {
-    var id:  String? = null
-    var itemId:  String? = null
-    var itemType:  String? = null
-    var permissionsLevel:  String? = null
-    var accessRestrictions: String? = null
+data class ShareLinkVO (
+    var id:  String? = null,
+    var itemId:  String? = null,
+    var itemType:  String? = null,
+    var permissionsLevel:  String? = null,
+    var accessRestrictions: String? = null,
 
-    var token: String? = null
+    var token: String? = null,
 
-    var maxUses: Int? = null // can be 0 for unlimited uses
+    var maxUses: Int? = null, // can be 0 for unlimited uses
 
-    var usesExpended: Int? = null
-    var expirationTimestamp: String? = null // can be null for no expiration
+    var usesExpended: Int? = null,
+    var expirationTimestamp: String? = null, // can be null for no expiration, or this format: "2026-11-17 13:56:31"
 
-    var createdAt: String? = null
-    var updatedAt: String? = null
-}
+    var createdAt: String? = null,
+    var updatedAt: String? = null,
+)

app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt

@@ -21,8 +21,11 @@ interface StelaAccountRepository {
 
     fun disableTwoFactor(twoFAVO: TwoFAVO, listener: IResponseListener)
 
-    fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?, listener: IResponseListener)
+    fun getShareLink(shareLinkIds: List<Int>, listener: ILinkListener)
 
     fun generateShareLink(shareLinkVO: ShareLinkVO, listener: ILinkListener)
 
+    fun updateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener)
+
+    fun deleteShareLink(shareLinkId: String, listener: IResponseListener)
 }

app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt

@@ -11,9 +11,9 @@ import org.permanent.permanent.network.ITwoFAListener
 import org.permanent.permanent.network.NetworkClient
 import org.permanent.permanent.network.models.ErrorResponse
 import org.permanent.permanent.network.models.ResponseVO
+import org.permanent.permanent.network.models.ShareLinkResponse
 import org.permanent.permanent.network.models.ShareLinkVO
 import org.permanent.permanent.network.models.ShareLinkVOResponse
-import org.permanent.permanent.network.models.ShareLinkResponse
 import org.permanent.permanent.network.models.TwoFAVO
 import retrofit2.Call
 import retrofit2.Callback
@@ -197,14 +197,14 @@ class StelaAccountRepositoryImpl(context: Context) : StelaAccountRepository {
         })
     }
 
-    override fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?, listener: IResponseListener) {
-        NetworkClient.instance().getShareLink(shareTokens, shareLinkIds).enqueue( object : Callback<ShareLinkVOResponse> {
+    override fun getShareLink(shareLinkIds: List<Int>, listener: ILinkListener) {
+        NetworkClient.instance().getShareLink(shareLinkIds).enqueue( object : Callback<ShareLinkVOResponse> {
 
             override fun onResponse(call: Call<ShareLinkVOResponse>, response: Response<ShareLinkVOResponse>) {
                 if (response.isSuccessful) {
                     val responseVO = response.body()
                     if (responseVO != null) {
-                        listener.onSuccess("")
+                        listener.onSuccess(responseVO.items[0])
                     } else {
                         listener.onFailed(appContext.getString(R.string.generic_error))
                     }
@@ -240,4 +240,53 @@ class StelaAccountRepositoryImpl(context: Context) : StelaAccountRepository {
             }
         })
     }
+
+    override fun updateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener) {
+        NetworkClient.instance().updateShareLink(shareLinkVO)
+            .enqueue(object : Callback<ResponseVO> {
+
+                override fun onResponse(call: Call<ResponseVO>, response: Response<ResponseVO>) {
+                    if (response.isSuccessful) {
+                        val responseVO = response.body()
+                        if (responseVO != null) {
+                            listener.onSuccess("")
+                        } else {
+                            listener.onFailed(appContext.getString(R.string.generic_error))
+                        }
+                    } else {
+                        try {
+                            listener.onFailed(response.errorBody().toString())
+                        } catch (e: Exception) {
+                            listener.onFailed(e.message)
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseVO>, t: Throwable) {
+                    listener.onFailed(t.message)
+                }
+            })
+    }
+
+    override fun deleteShareLink(shareLinkId: String, listener: IResponseListener) {
+        NetworkClient.instance().deleteShareLink(shareLinkId)
+            .enqueue(object : Callback<ResponseVO> {
+
+                override fun onResponse(call: Call<ResponseVO>, response: Response<ResponseVO>) {
+                    if (response.isSuccessful) {
+                        listener.onSuccess("")
+                    } else {
+                        try {
+                            listener.onFailed(response.errorBody().toString())
+                        } catch (e: Exception) {
+                            listener.onFailed(e.message)
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseVO>, t: Throwable) {
+                    listener.onFailed(t.message)
+                }
+            })
+    }
 }

app/src/main/java/org/permanent/permanent/ui/Extensions.kt

@@ -20,7 +20,11 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
@@ -117,6 +121,26 @@ fun bytesToCustomHumanReadableString(bytes: Long, showDecimal: Boolean): String
     }.toString()
 }
 
+private val BACKEND_DATE_TIME_FORMATTER: DateTimeFormatter =
+    DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+
+/**
+ * Convert a LocalDate to a backend datetime string.
+ *
+ * @param useEndOfDay if true, result will be at 23:59:59 of the date (default = true).
+ *                    if false, result will be at 00:00:00 of the date.
+ */
+fun LocalDate.toBackendDateTimeString(useEndOfDay: Boolean = true): String? {
+    val time = if (useEndOfDay) LocalTime.of(23, 59, 59) else LocalTime.MIDNIGHT
+    val dt = LocalDateTime.of(this, time)
+    return dt.format(BACKEND_DATE_TIME_FORMATTER)
+}
+
+fun String.toLocalDateUtc(): LocalDate =
+    Instant.parse(this)
+        .atZone(ZoneOffset.UTC)
+        .toLocalDate()
+
 fun String?.toDisplayDate(): String {
     if (this.isNullOrBlank()) return ""
     return try {