Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #290 - Share settings do not work

This commit is contained in:
Thomas 2022-08-01 10:43:58 +02:00
parent 745de828bb
commit 3a9e885cef
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View File

@ -311,7 +311,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
count++; count++;
} }
} }
if (url[0] != null && count == 1) { SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
boolean fetchSharedMedia = sharedpreferences.getBoolean(getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true);
boolean fetchShareContent = sharedpreferences.getBoolean(getString(R.string.SET_SHARE_DETAILS), true);
if (url[0] != null && count == 1 && (fetchShareContent || fetchSharedMedia)) {
new Thread(() -> { new Thread(() -> {
if (url[0].startsWith("www.")) if (url[0].startsWith("www."))
url[0] = "http://" + url[0]; url[0] = "http://" + url[0];
@ -355,13 +358,17 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
Matcher matcherImage = imagePattern.matcher(data); Matcher matcherImage = imagePattern.matcher(data);
String titleEncoded = null; String titleEncoded = null;
String descriptionEncoded = null; String descriptionEncoded = null;
while (matcherTitle.find()) if (fetchShareContent) {
titleEncoded = matcherTitle.group(1); while (matcherTitle.find())
while (matcherDescription.find()) titleEncoded = matcherTitle.group(1);
descriptionEncoded = matcherDescription.group(1); while (matcherDescription.find())
descriptionEncoded = matcherDescription.group(1);
}
String image = null; String image = null;
while (matcherImage.find()) if (fetchSharedMedia) {
image = matcherImage.group(1); while (matcherImage.find())
image = matcherImage.group(1);
}
String title = null; String title = null;
String description = null; String description = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@ -379,8 +386,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
String finalTitle = title; String finalTitle = title;
String finalDescription = description; String finalDescription = description;
runOnUiThread(() -> { runOnUiThread(() -> {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString(Helper.ARG_SHARE_URL, url[0]); b.putString(Helper.ARG_SHARE_URL, url[0]);
b.putString(Helper.ARG_SHARE_URL_MEDIA, finalImage); b.putString(Helper.ARG_SHARE_URL_MEDIA, finalImage);