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

fixed #678

This commit is contained in:
Mariotaku Lee 2017-01-13 01:29:15 +08:00
parent 829bbcb469
commit 7ccf5df99c
3 changed files with 15 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/SharedPreferenceConstants.java
View File

@ -86,7 +86,6 @@ public interface SharedPreferenceConstants {
String DEFAULT_QUOTE_FORMAT = "RT @" + FORMAT_PATTERN_NAME + ": " + FORMAT_PATTERN_TEXT;
String DEFAULT_SHARE_FORMAT = FORMAT_PATTERN_TITLE + " - " + FORMAT_PATTERN_TEXT;
String DEFAULT_IMAGE_UPLOAD_FORMAT = FORMAT_PATTERN_TEXT + " " + FORMAT_PATTERN_LINK;
String DEFAULT_REFRESH_INTERVAL = "15";
boolean DEFAULT_AUTO_REFRESH = true;

8
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -765,13 +765,13 @@ public final class Utils implements Constants {
public static String getShareStatus(final Context context, final CharSequence title, final CharSequence text) {
if (context == null) return null;
String share_format = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE).getString(
String shareFormat = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE).getString(
KEY_SHARE_FORMAT, DEFAULT_SHARE_FORMAT);
if (TextUtils.isEmpty(share_format)) {
share_format = DEFAULT_SHARE_FORMAT;
if (TextUtils.isEmpty(shareFormat)) {
shareFormat = DEFAULT_SHARE_FORMAT;
}
if (TextUtils.isEmpty(title)) return ParseUtils.parseString(text);
return share_format.replace(FORMAT_PATTERN_TITLE, title).replace(FORMAT_PATTERN_TEXT, text != null ? text : "");
return shareFormat.replace(FORMAT_PATTERN_TITLE, title).replace(FORMAT_PATTERN_TEXT, text != null ? text : "");
}
public static String getTabDisplayOption(final Context context) {

12
twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt
View File

@ -254,7 +254,17 @@ class WebLinkHandlerActivity : Activity(), Constants {
handledIntent.action = Intent.ACTION_SEND
val text = uri.getQueryParameter("text")
val url = uri.getQueryParameter("url")
handledIntent.putExtra(Intent.EXTRA_TEXT, Utils.getShareStatus(this, text, url))
val sb = StringBuilder()
if (!text.isNullOrEmpty()) {
sb.append(text)
}
if (!url.isNullOrEmpty()) {
if (!sb.isEmpty()) {
sb.append(" ")
}
sb.append(url)
}
handledIntent.putExtra(Intent.EXTRA_TEXT, sb.toString())
return Pair.create(handledIntent, true)
}
}