Commit 9a79b9dc authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop' into improve_admin

parents 74b69b60 39c49fad

app/build.gradle

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

        minSdk 21

        targetSdk 31

        versionCode 424

        versionName "3.6.3"

        versionCode 425

        versionName "3.6.4"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

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

+5 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.6.4",

    "code": "425",

    "note": "Changed:\n- Tag search ordered by popularity\n\nFixed:\n- Unable to get client ID on some devices\n- Issue with messages/notifications not correctly displayed\n- Notifications not received\n- Friendica: issues with mentions and tags (open browser)\n- Improve sharing behaviour"

  },

  {

    "version": "3.6.3",

    "code": "424",

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

+14 −12
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class FragmentMastodonTag extends Fragment { 
            binding.noActionText.setText(R.string.no_tags);

            return;

        }

        if (search != null) {

            Collections.sort(tags, (obj1, obj2) -> Integer.compare(obj2.getWeight(), obj1.getWeight()));

            boolean isInCollection = false;

            for (Tag tag : tags) {
@@ -135,6 +136,7 @@ public class FragmentMastodonTag extends Fragment { 
                tag.history = new ArrayList<>();

                tags.add(0, tag);

            }

        }

        binding.recyclerView.setVisibility(View.VISIBLE);

        binding.noAction.setVisibility(View.GONE);

        tagAdapter = new TagAdapter(tags);

src/fdroid/fastlane/metadata/android/en/changelogs/425.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Changed:

- Tag search ordered by popularity



Fixed:

- Unable to get client ID on some devices

- Issue with messages/notifications not correctly displayed

- Notifications not received

- Friendica: issues with mentions and tags (open browser)

- Improve sharing behaviour
 
 No newline at end of file