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

Fix issue #276 - Problem when sharing text with URL

This commit is contained in:
Thomas 2022-11-04 15:49:47 +01:00
parent 3883af2f78
commit 60a1b2bfa4
2 changed files with 102 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,6 +852,12 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
boolean fetchSharedMedia = sharedpreferences.getBoolean(getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true); 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); boolean fetchShareContent = sharedpreferences.getBoolean(getString(R.string.SET_SHARE_DETAILS), true);
if (url[0] != null && count == 1 && (fetchShareContent || fetchSharedMedia)) { if (url[0] != null && count == 1 && (fetchShareContent || fetchSharedMedia)) {
if (!url[0].trim().equalsIgnoreCase(sharedText.trim())) {
Bundle b = new Bundle();
b.putString(Helper.ARG_SHARE_TITLE, sharedSubject);
b.putString(Helper.ARG_SHARE_DESCRIPTION, sharedText);
CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
} else {
new Thread(() -> { new Thread(() -> {
if (url[0].startsWith("www.")) if (url[0].startsWith("www."))
url[0] = "http://" + url[0]; url[0] = "http://" + url[0];
@ -949,6 +955,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
} }
}).start(); }).start();
}
} else { } else {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString(Helper.ARG_SHARE_TITLE, sharedSubject); b.putString(Helper.ARG_SHARE_TITLE, sharedSubject);

2
app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
View File

@ -434,7 +434,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
} }
if (description != null && description.trim().length() > 0) { if (description != null && description.trim().length() > 0) {
statusList.get(position).text += description + "\n\n"; statusList.get(position).text += description + "\n\n";
if (!description.contains(url)) { if (url != null && !description.contains(url)) {
statusList.get(position).text += url; statusList.get(position).text += url;
} }
} else if (content != null && content.trim().length() > 0) { } else if (content != null && content.trim().length() > 0) {