Commit 0b2eb64a authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents 7ada093a 88f5ed27

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 32

        versionCode 437

        versionName "3.9.2"

        versionCode 438

        versionName "3.9.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/assets/release_notes/notes.json

+2 −2
Original line number Diff line number Diff line 
[

  {

    "version": "3.9.2",

    "code": "437",

    "version": "3.9.3",

    "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"

  },

  {

app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ public class PinnedTimelineHelper { 
                boolean present = false;

                try {

                    Pinned pinnedAll = new Pinned(activity).getAllPinned(currentAccount);

                    if (pinnedAll == null) {

                        pinnedAll = pinned;

                    }

                    for (PinnedTimeline pinnedTimeline : pinnedAll.pinnedTimelines) {

                        if (pinnedTimeline.mastodonList != null && mastodonList.id.compareTo(pinnedTimeline.mastodonList.id) == 0) {

                            present = true;