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

updated version

This commit is contained in:
Mariotaku Lee 2017-04-12 22:09:53 +08:00
parent e9966bd6fc
commit 1512973157
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java
View File

@ -132,6 +132,7 @@ public interface IntentConstants {
String EXTRA_ITEMS = "items";
String EXTRA_USER_LIST = "user_list";
String EXTRA_USER_LISTS = "user_lists";
String EXTRA_APPEND_TEXT = "append_text";
String EXTRA_IS_REPLACE_MODE = "is_replace_mode";
String EXTRA_NAME = "name";
String EXTRA_POSITION = "position";

4
twidere/build.gradle
View File

@ -36,8 +36,8 @@ android {
applicationId "org.mariotaku.twidere"
minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14
targetSdkVersion 25
versionCode 328
versionName '3.5.11'
versionCode 329
versionName '3.5.12'
multiDexEnabled true
buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'

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

@ -318,10 +318,15 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
}
REQUEST_EXTENSION_COMPOSE -> {
if (resultCode == Activity.RESULT_OK && data != null) {
val text = data.getCharSequenceExtra(Intent.EXTRA_TEXT)
// The latter two is for compatibility
val text = data.getCharSequenceExtra(Intent.EXTRA_TEXT) ?:
data.getStringExtra(EXTRA_TEXT) ?:
data.getStringExtra(EXTRA_APPEND_TEXT)
val isReplaceMode = data.getBooleanExtra(EXTRA_IS_REPLACE_MODE,
data.getStringExtra(EXTRA_APPEND_TEXT) == null)
if (text != null) {
val editable = editText.editableText
if (editable == null || data.getBooleanExtra(EXTRA_IS_REPLACE_MODE, false)) {
if (editable == null || isReplaceMode) {
editText.setText(text)
} else {
editable.replace(editText.selectionStart, editText.selectionEnd, text)
@ -330,8 +335,9 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
updateTextCount()
}
val src = MediaPickerActivity.getMediaUris(data)
if (src.isNotNullOrEmpty()) {
val src = MediaPickerActivity.getMediaUris(data)?.takeIf(Array<Uri>::isNotEmpty) ?:
data.getParcelableExtra<Uri>(EXTRA_IMAGE_URI)?.let { arrayOf(it) }
if (src != null) {
TaskStarter.execute(AddMediaTask(this, src, false, false))
}
}