Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into chameleon

This commit is contained in:
Mariotaku Lee 2016-12-18 10:41:28 +08:00
parent 049f9f65b1 50b46c2e10
commit 7f3d429017
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

@ -192,7 +192,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
} }
override fun onDestroy() { override fun onDestroy() {
if (!shouldSkipDraft && hasComposingStatus()) { if (!shouldSkipDraft && hasComposingStatus() && isFinishing) {
saveToDrafts() saveToDrafts()
Toast.makeText(this, R.string.status_saved_to_draft, Toast.LENGTH_SHORT).show() Toast.makeText(this, R.string.status_saved_to_draft, Toast.LENGTH_SHORT).show()
} }

2
twidere/src/main/res/values/strings.xml
View File

@ -777,6 +777,8 @@
<string name="provider_gnusocial_de">GNU Social.de</string> <string name="provider_gnusocial_de">GNU Social.de</string>
<string name="new_document_api">New Document API</string> <string name="new_document_api">New Document API</string>
<string name="new_document_api_summary">Open profile and media in new task</string> <string name="new_document_api_summary">Open profile and media in new task</string>
<string name="preference_multitasking">Multitasking</string>
<string name="preference_multitasking_summary">Open profile and media in new task</string>
<string name="drawer_toggle">Drawer toggle</string> <string name="drawer_toggle">Drawer toggle</string>
<!-- GNU social group like https://quitter.se/group/qvitter --> <!-- GNU social group like https://quitter.se/group/qvitter -->
<string name="group">Group</string> <string name="group">Group</string>

4
twidere/src/main/res/xml/preferences_content.xml
View File

@ -74,8 +74,8 @@
android:defaultValue="true" android:defaultValue="true"
android:enabled="@bool/support_new_document_intent" android:enabled="@bool/support_new_document_intent"
android:key="new_document_api" android:key="new_document_api"
android:summary="@string/new_document_api_summary" android:summary="@string/preference_multitasking_summary"
android:title="@string/new_document_api"/> android:title="@string/preference_multitasking"/>
</PreferenceCategory> </PreferenceCategory>