Merge pull request #352 from mudkipme/fix/memos-0-27

fix: memos 0.27.0 support

Author: mudkipme

README.md

@@ -8,7 +8,7 @@
 
 You can use Moe Memos with either a self-hosted [✍️memos](https://github.com/usememos/memos) server or locally on your device (no server required).
 
-**Note: Current Moe Memos version supports Memos 0.21.0 and Memos 0.26.0 to 0.26.2. Memos update may introduce breaking API changes. If you are using a version higher than 0.26.2, it is recommended to use [Mortis](https://github.com/mudkipme/mortis) to convert the newer Memos API to the Memos 0.21.0 API and re-login in Moe Memos.**
+**Note: Current Moe Memos version supports Memos 0.21.0 and Memos 0.27.0 to 0.27.1. Memos update may introduce breaking API changes. If you are using a version higher than 0.27.1, it is recommended to use [Mortis](https://github.com/mudkipme/mortis) to convert the newer Memos API to the Memos 0.21.0 API and re-login in Moe Memos.**
 
 ## Installation
 

app/src/main/java/me/mudkip/moememos/data/model/Account.kt

@@ -4,8 +4,8 @@ import java.time.Instant
 
 sealed class Account {
     fun accountKey(): String = when (this) {
-        is MemosV0 -> "memos:${this.info.host}:${this.info.id}"
-        is MemosV1 -> "memos:${this.info.host}:${this.info.id}"
+        is MemosV0 -> "memos:${this.info.host}:${this.info.remoteIdentifier}"
+        is MemosV1 -> "memos:${this.info.host}:${this.info.remoteIdentifier}"
         is Local -> "local"
     }
 
@@ -50,7 +50,7 @@ private fun MemosAccount.toUser(): User {
         Instant.now()
     }
     return User(
-        identifier = id.toString(),
+        identifier = remoteIdentifier,
         name = name,
         startDate = startDate,
         defaultVisibility = visibility

app/src/main/java/me/mudkip/moememos/data/model/MemosAccount.kt

@@ -7,7 +7,6 @@ import java.net.URI
 data class MemosAccount(
     val host: String = "",
     val accessToken: String = "",
-    val id: Long = 0L,
     val name: String = "",
     val avatarUrl: String = "",
     val startDateEpochSecond: Long = 0L,

app/src/main/java/me/mudkip/moememos/ext/DataStoreExt.kt

@@ -7,6 +7,6 @@ import me.mudkip.moememos.data.model.Settings
 import me.mudkip.moememos.util.SettingsSerializer
 
 val Context.settingsDataStore: DataStore<Settings> by dataStore(
-    fileName = "settings_v2.json",
+    fileName = "settings_v3.json",
     serializer = SettingsSerializer
 )

app/src/main/java/me/mudkip/moememos/util/Int53Hash.kt

@@ -28,7 +28,6 @@ import me.mudkip.moememos.data.model.UserData
 import me.mudkip.moememos.data.service.AccountService
 import me.mudkip.moememos.ext.string
 import me.mudkip.moememos.ext.suspendOnNotLogin
-import me.mudkip.moememos.util.toInt53Hash
 import okhttp3.OkHttpClient
 import java.time.Instant
 import javax.inject.Inject
@@ -178,7 +177,7 @@ class UserStateViewModel @Inject constructor(
         info = MemosAccount(
             host = host,
             accessToken = accessToken,
-            id = user.id,
+            remoteIdentifier = user.id.toString(),
             name = user.username ?: user.displayName,
             avatarUrl = user.avatarUrl ?: "",
             startDateEpochSecond = user.createdTs,
@@ -191,7 +190,6 @@ class UserStateViewModel @Inject constructor(
         info = MemosAccount(
             host = host,
             accessToken = accessToken,
-            id = user.name.toInt53Hash(),
             name = user.username,
             avatarUrl = user.avatarUrl ?: "",
             startDateEpochSecond = user.createTime?.epochSecond ?: 0L,

app/src/main/java/me/mudkip/moememos/viewmodel/UserStateViewModel.kt

@@ -0,0 +1,13 @@
+## What's Changed
+- Added support for Memos 0.27.0 and 0.27.1. Due to breaking API changes, Memos versions 0.22.0-0.26.2 are no longer supported. You can continue using Memos 0.21.0 or upgrade to 0.27.1.
+- Added Brazilian Portuguese localization by @ciro-mota.
+- Improved the home screen widget by @majo-icutech.
+- Added an optional account label to settings by jeff-bennett.
+- Fixed a crash when uploading large files.
+
+## New Contributors
+* @ciro-mota made their first contribution in https://github.com/mudkipme/MoeMemosAndroid/pull/341
+* @majo-icutech made their first contribution in https://github.com/mudkipme/MoeMemosAndroid/pull/346
+* @jeff-bennett made their first contribution in https://github.com/mudkipme/MoeMemosAndroid/pull/349
+
+**Full Changelog**: https://github.com/mudkipme/MoeMemosAndroid/compare/2.0.2...2.0.3