Commit 2f89e883 authored by Thomas's avatar Thomas
Browse files

Release 3.3.0

parent 05074439

app/build.gradle

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

        minSdk 21

        targetSdk 31

        versionCode 406

        versionName "3.2.1"

        versionCode 407

        versionName "3.3.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

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

+3 −3
Original line number Diff line number Diff line 
[

  {

    "version": "3.2.1",

    "code": "406",

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

    "version": "3.3.0",

    "code": "407",

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

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -630,10 +630,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                        item.setIcon(R.drawable.ic_person);

                                        boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false);

                                        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;

                                        }

                                        if (!this.isDestroyed() && !this.isFinishing()) {

                                        if (!this.isDestroyed() && !this.isFinishing() && url != null) {

                                            if (url.contains(".gif")) {

                                                Glide.with(BaseMainActivity.this)

                                                        .asGif()

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java

+1 −1
Original line number Diff line number Diff line
@@ -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()))

                                        .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 -> {

                                                    if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null) {

                                                    if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null && pinnedStatuses.statuses != null) {

                                                        for (Status status : pinnedStatuses.statuses) {

                                                            status.pinned = true;

                                                        }