summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2023-01-27 12:10:21 +0100
committerThomas <tschneider.ac@gmail.com>2023-01-27 12:10:21 +0100
commitb52ab37aede6402b53c38a9667383bcc8843c4ca (patch)
tree517efda085f940534f41d8ccc92f1a0310cbcb63
parent554335aa6e8be64860a56aac87ed852498eff259 (diff)
Fix Text cleared when adding a media
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java3
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/472.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 0372043b1..1bf483d69 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -334,7 +334,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
holder.binding.content.setSelection(statusDraft.cursorPosition); //Put cursor at the end
buttonVisibility(holder);
});
- } else if (mentionedAccount != null) {
+ } else if (mentionedAccount != null && statusDraft.text == null) {
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
boolean capitalize = sharedpreferences.getBoolean(context.getString(R.string.SET_CAPITALIZE), true);
if (capitalize) {
@@ -537,6 +537,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
if (holder.binding.content.getSelectionStart() > 0 && holder.getLayoutPosition() >= 0) {
statusList.get(holder.getLayoutPosition()).cursorPosition = holder.binding.content.getSelectionStart();
}
+
//Copy/past
int max_car = MastodonHelper.getInstanceMaxChars(context);
if (currentLength > max_car) {
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
index 4d5420e31..41188591d 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/472.txt
@@ -5,5 +5,5 @@ Changed:
- Cross actions with two accounts display a dialog
Fixed:
-
+- Text cleared when adding a media
- Fix crashes \ No newline at end of file