Commit 8c98b9e4 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents c3006080 47e43193

app/build.gradle

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

        minSdk 21

        targetSdk 33

        versionCode 457

        versionName "3.13.3"

        versionCode 462

        versionName "3.14.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

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

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

  {

    "version": "3.14.0",

    "code": "462",

    "note": "Added:\n\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n- Pixelfed: Custom layout to display Media fully (Also works for other software when there are media)\n- Allow to align left action buttons in messages\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Links to messages not handled by the app\n- CW when editing a message\n- Fix push notifications with several accounts\n- New messages or edition notifications not pushed\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Fix crashes"

  },

  {

    "version": "3.13.7",

    "code": "461",

    "note": "Added:\n- Pixelfed: Custom layout to display Media fully \n*(Settings > Timelines > Pixelfed Presentation) - Also works for other softwares when there are media\n\nChanged:\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Fix push notifications with several accounts\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Some crashes"

  },

  {

    "version": "3.13.6",

    "code": "460",

    "note": "Fixed:\n- Cross-compose: Wrong instance emojis\n- Custom emojis not displayed in notifications\n- Fav/Boost markers with shared messages\n- Empty notifications\n- Fix cw removed when replying\n- Fix expand media with fit preview images when sensitive\n- Fix an issue with fetch more displayed too often (cache clear will help or wait new messages)"

  },

  {

    "version": "3.13.5",

    "code": "459",

    "note": "Added:\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n\nFixed:\n- Crashes"

  },

  {

    "version": "3.13.4",

    "code": "458",

    "note": "Added:\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n\nFixed:\n- Spoiler text when editing\n- Fix watermarks"

  },

  {

    "version": "3.13.3",

    "code": "457",

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

+8 −8
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ import retrofit2.converter.gson.GsonConverterFactory; 


public abstract class BaseMainActivity extends BaseActivity implements NetworkStateReceiver.NetworkStateReceiverListener, FragmentMastodonTimeline.UpdateCounters, FragmentNotificationContainer.UpdateCounters, FragmentMastodonConversation.UpdateCounters {



    private static final int REQUEST_CODE = 5415;

    public static String currentInstance, currentToken, currentUserID, client_id, client_secret, software;

    public static HashMap<String, List<Emoji>> emojis = new HashMap<>();

    public static Account.API api;
@@ -297,7 +298,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
    };

    private NetworkStateReceiver networkStateReceiver;

    private boolean headerMenuOpen;

    private static final int REQUEST_CODE = 5415;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -683,6 +683,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                regex_local = sharedpreferences.getString(getString(R.string.SET_FILTER_REGEX_LOCAL) + currentUserID + currentInstance, null);

                regex_public = sharedpreferences.getString(getString(R.string.SET_FILTER_REGEX_PUBLIC) + currentUserID + currentInstance, null);

                show_art_nsfw = sharedpreferences.getBoolean(getString(R.string.SET_ART_WITH_NSFW) + currentUserID + currentInstance, false);



                binding.profilePicture.setOnClickListener(v -> binding.drawerLayout.openDrawer(GravityCompat.START));

                Helper.loadPP(BaseMainActivity.this, binding.profilePicture, currentAccount);

                headerMainBinding.accountAcc.setText(String.format("%s@%s", currentAccount.mastodon_account.username, currentAccount.instance));
@@ -785,7 +786,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        });







        binding.toolbarSearch.setOnSearchClickListener(v -> binding.tabLayout.setVisibility(View.VISIBLE));

        //For receiving  data from other activities

        LocalBroadcastManager.getInstance(BaseMainActivity.this).registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));
@@ -1072,7 +1072,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 


                                                    if (title.length() > 0) {

                                                        // OG title fetched from source

                                                        if(titleBuilder.length() > 0) titleBuilder.append("\n\n");

                                                        if (titleBuilder.length() > 0)

                                                            titleBuilder.append("\n\n");

                                                        titleBuilder.append(title);

                                                    }
@@ -1138,7 +1139,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                        b.putSerializable(Helper.ARG_MEDIA_ATTACHMENTS, new ArrayList<>(attachments));

                        CrossActionHelper.doCrossShare(BaseMainActivity.this, b);

                    });

                    CrossActionHelper.doCrossShare(BaseMainActivity.this, b);

                } else {

                    Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();

                }

app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ public class AccountReportActivity extends BaseBarActivity { 
        }



    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

+8 −8
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
    private Status statusReply, statusMention, statusQuoted;

    private StatusDraft statusDraft;

    private ComposeAdapter composeAdapter;

    private boolean promptSaveDraft;

    private boolean restoredDraft;

    private List<Attachment> sharedAttachments;





    private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(android.content.Context context, Intent intent) {
@@ -138,7 +133,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            }

        }

    };



    private boolean promptSaveDraft;

    private boolean restoredDraft;

    private List<Attachment> sharedAttachments;

    private ActivityPaginationBinding binding;

    private BaseAccount account;

    private String instance, token;
@@ -537,10 +534,10 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
        if (token == null) {

            token = account.token;

        }

        if (emojis == null || !emojis.containsKey(currentInstance)) {

        if (emojis == null || !emojis.containsKey(instance)) {

            new Thread(() -> {

                try {

                    emojis.put(currentInstance, new EmojiInstance(ComposeActivity.this).getEmojiList(currentInstance));

                    emojis.put(instance, new EmojiInstance(ComposeActivity.this).getEmojiList(instance));

                } catch (DBException e) {

                    e.printStackTrace();

                }
@@ -637,6 +634,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            }

            if (statusReply.spoiler_text != null) {

                statusDraftList.get(0).spoiler_text = statusReply.spoiler_text;

                if (statusReply.spoiler_text.trim().length() > 0) {

                    statusDraftList.get(0).spoilerChecked = true;

                }

            }

            if (statusReply.language != null && !statusReply.language.isEmpty()) {

                statusDraftList.get(0).language = statusReply.language;