diff options
3 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java index 348e47799..375576c93 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java @@ -114,6 +114,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana private List<Status> statusList; private Status statusReply, statusMention, statusQuoted; private StatusDraft statusDraft; + private ActionBar actionBar; private ComposeAdapter composeAdapter; private final BroadcastReceiver imageReceiver = new BroadcastReceiver() { @Override @@ -482,7 +483,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana setSupportActionBar(binding.toolbar); promptSaveDraft = false; restoredDraft = false; - ActionBar actionBar = getSupportActionBar(); + actionBar = getSupportActionBar(); //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); @@ -1025,6 +1026,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana @Override public void click(ComposeAdapter.ComposeViewHolder holder, Attachment attachment, int messagePosition, int mediaPosition) { binding.description.setVisibility(View.VISIBLE); + actionBar.hide(); binding.recyclerView.setVisibility(View.GONE); binding.mediaDescription.setText(""); String attachmentPath = attachment.local_path != null && !attachment.local_path.trim().isEmpty() ? attachment.local_path : attachment.preview_url; @@ -1042,11 +1044,13 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana binding.mediaSave.setOnClickListener(v -> { binding.description.setVisibility(View.GONE); + actionBar.show(); binding.recyclerView.setVisibility(View.VISIBLE); composeAdapter.openDescriptionActivity(true, binding.mediaDescription.getText().toString().trim(), holder, attachment, messagePosition, mediaPosition); }); binding.mediaCancel.setOnClickListener(v -> { binding.description.setVisibility(View.GONE); + actionBar.show(); binding.recyclerView.setVisibility(View.VISIBLE); composeAdapter.openDescriptionActivity(false, binding.mediaDescription.getText().toString().trim(), holder, attachment, messagePosition, mediaPosition); }); diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java index 6759a45a1..8d9e09bc0 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java @@ -41,7 +41,6 @@ import java.net.IDN; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import app.fedilab.android.BaseMainActivity; @@ -126,7 +125,9 @@ public class NotificationsHelper { } } } finally { - lock.unlock(); + if (lock.isHeldByCurrentThread()) { + lock.unlock(); + } } }).start(); } diff --git a/app/src/main/res/layouts/mastodon/layout/activity_pagination.xml b/app/src/main/res/layouts/mastodon/layout/activity_pagination.xml index dda566c64..d2ff9ddae 100644 --- a/app/src/main/res/layouts/mastodon/layout/activity_pagination.xml +++ b/app/src/main/res/layouts/mastodon/layout/activity_pagination.xml @@ -87,6 +87,7 @@ <androidx.appcompat.widget.AppCompatEditText android:id="@+id/media_description" + android:textCursorDrawable="@drawable/color_cursor" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" |