Release 3.3.0

This commit is contained in:
Thomas 2022-09-13 17:55:30 +02:00
parent 05074439c9
commit 2f89e88330
4 changed files with 8 additions and 8 deletions

View file

@ -13,8 +13,8 @@ android {
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 31 targetSdk 31
versionCode 406 versionCode 407
versionName "3.2.1" versionName "3.3.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
flavorDimensions "default" flavorDimensions "default"

View file

@ -1,8 +1,8 @@
[ [
{ {
"version": "3.2.1", "version": "3.3.0",
"code": "406", "code": "407",
"note": "Added:\n- Settings to set all timelines at the top\n- Settings to display timelines in a list\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing" "note": "Added:\n- Settings to set all timelines at the top (default disabled)\n- Settings to display timelines in a list (default disabled)\n- Display counters for fav/reblog in timelines (default disabled)\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing\n- Some crashes"
}, },
{ {
"version": "3.2.0", "version": "3.2.0",

View file

@ -630,10 +630,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
item.setIcon(R.drawable.ic_person); item.setIcon(R.drawable.ic_person);
boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false); boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false);
String url = !disableGif ? account.mastodon_account.avatar : account.mastodon_account.avatar_static; String url = !disableGif ? account.mastodon_account.avatar : account.mastodon_account.avatar_static;
if (url.startsWith("/")) { if (url != null && url.startsWith("/")) {
url = "https://" + account.instance + account.mastodon_account.avatar; url = "https://" + account.instance + account.mastodon_account.avatar;
} }
if (!this.isDestroyed() && !this.isFinishing()) { if (!this.isDestroyed() && !this.isFinishing() && url != null) {
if (url.contains(".gif")) { if (url.contains(".gif")) {
Glide.with(BaseMainActivity.this) Glide.with(BaseMainActivity.this)
.asGif() .asGif()

View file

@ -788,7 +788,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity())) accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity()))
.observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity())) .observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity()))
.observe(getViewLifecycleOwner(), otherStatuses -> { .observe(getViewLifecycleOwner(), otherStatuses -> {
if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null) { if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null && pinnedStatuses.statuses != null) {
for (Status status : pinnedStatuses.statuses) { for (Status status : pinnedStatuses.statuses) {
status.pinned = true; status.pinned = true;
} }