Merge branch 'develop'

maths
Thomas 2 years ago
commit 0b2eb64a72

@ -13,8 +13,8 @@ android {
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 32 targetSdk 32
versionCode 437 versionCode 438
versionName "3.9.2" versionName "3.9.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
flavorDimensions "default" flavorDimensions "default"

@ -1,7 +1,7 @@
[ [
{ {
"version": "3.9.2", "version": "3.9.3",
"code": "437", "code": "438",
"note": "Added:\n- New design with 5 themes\n\nChanged:\n- Remove built-in browser support\n- Fit preview image displays images vertically\n- Add counters next to images\n\nFixed:\n- Jumps in timelines\n- Replies to wrong messages with followed instances\n- Bug with delete&redraft with a media\n- List cannot be hidden\n- Some crashes" "note": "Added:\n- New design with 5 themes\n\nChanged:\n- Remove built-in browser support\n- Fit preview image displays images vertically\n- Add counters next to images\n\nFixed:\n- Jumps in timelines\n- Replies to wrong messages with followed instances\n- Bug with delete&redraft with a media\n- List cannot be hidden\n- Some crashes"
}, },
{ {

@ -276,6 +276,9 @@ public class PinnedTimelineHelper {
boolean present = false; boolean present = false;
try { try {
Pinned pinnedAll = new Pinned(activity).getAllPinned(currentAccount); Pinned pinnedAll = new Pinned(activity).getAllPinned(currentAccount);
if (pinnedAll == null) {
pinnedAll = pinned;
}
for (PinnedTimeline pinnedTimeline : pinnedAll.pinnedTimelines) { for (PinnedTimeline pinnedTimeline : pinnedAll.pinnedTimelines) {
if (pinnedTimeline.mastodonList != null && mastodonList.id.compareTo(pinnedTimeline.mastodonList.id) == 0) { if (pinnedTimeline.mastodonList != null && mastodonList.id.compareTo(pinnedTimeline.mastodonList.id) == 0) {
present = true; present = true;

Loading…
Cancel
Save