Prechádzať zdrojové kódy

Merge pull request #3261 from nextcloud/bugfix/3243/avoidWrongAccountScheduledForDeletionInfo

avoid falsely shown "Account scheduled for deletion" info
Marcel Hibbe 1 rok pred
rodič
commit
741647ee5b

+ 1 - 1
app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -471,7 +471,7 @@ class SettingsActivity : BaseActivity() {
     private fun removeCurrentAccount() {
         val otherUserExists = userManager.scheduleUserForDeletionWithId(currentUser!!.id!!).blockingGet()
         val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java).build()
-        WorkManager.getInstance(this).enqueue(accountRemovalWork)
+        WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork)
         if (otherUserExists) {
             // TODO: find better solution once Conductor is removed
             finish()

+ 0 - 1
app/src/main/res/values/strings.xml

@@ -376,7 +376,6 @@ How to translate with transifex:
     <string name="nc_add_attachment">Add attachment</string>
     <string name="emoji_category_recent">Recent</string>
     <string name="emoji_backspace">Backspace</string>
-    <string name="emoji_search">Search emoji</string>
 
     <!-- Conversation info guest access -->
     <string name="nc_guest_access">Guest access</string>