Merge branch 'beta' into fix/out-of-memory

app/src/main/java/chat/rocket/android/files/uimodel/FileUiModel.kt

@@ -34,8 +34,8 @@ class FileUiModel(
     }
 
     private fun getUserDisplayName(): String {
-        val username = "@${genericAttachment.user?.username}"
-        val realName = genericAttachment.user?.name
+        val username = "@${genericAttachment.user.username}"
+        val realName = genericAttachment.user.name
         val uploaderName = if (settings.useRealName()) realName else username
         return uploaderName ?: username
     }

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt

@@ -14,12 +14,12 @@ class SharedPreferencesAccountsRepository(
     private val moshi: Moshi
 ) : AccountsRepository {
 
-    override fun save(newAccount: Account) {
+    override fun save(account: Account) {
         val accounts = load()
 
-        val newList = accounts.filter { account -> newAccount.serverUrl != account.serverUrl }
+        val newList = accounts.filter { it.serverUrl != it.serverUrl }
             .toMutableList()
-        newList.add(0, newAccount)
+        newList.add(0, account)
         save(newList)
     }
 

app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt

@@ -27,7 +27,7 @@ class PasswordPresenter @Inject constructor(
 
                 val me = retryIO("me") { client.me() }
                 retryIO("updateProfile(${me.id})") {
-                    client.updateProfile(me.id!!, null, null, password, null)
+                    client.updateProfile(me.id, null, null, password, null)
                 }
 
                 view.showPasswordSuccessfullyUpdatedMessage()

app/src/main/res/values-ja/strings.xml

@@ -44,8 +44,9 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_password">パスワードの変更</item>
-        <item name="item_password">このアプリケーションについて</item>
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
+        <item name="item_password">About</item> <!-- TODO Add translation -->
     </string-array>
 
     <!-- Regular information messages -->