Commit 917f3333 authored by Thomas's avatar Thomas
Browse files

some fixes

parent a013c160

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

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ import app.fedilab.android.mastodon.helper.Helper; 
import app.fedilab.android.mastodon.helper.MastodonHelper;

import app.fedilab.android.mastodon.helper.PinnedTimelineHelper;

import app.fedilab.android.mastodon.helper.PushHelper;

import app.fedilab.android.mastodon.helper.ThemeHelper;

import app.fedilab.android.mastodon.ui.drawer.AccountsSearchTopBarAdapter;

import app.fedilab.android.mastodon.ui.drawer.TagSearchTopBarAdapter;

import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonConversation;
@@ -719,6 +720,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                        Toasty.info(activity, activity.getString(R.string.toast_account_changed, acct), Toasty.LENGTH_LONG).show();

                        BaseMainActivity.currentToken = account.token;

                        BaseMainActivity.currentUserID = account.user_id;

                        ThemeHelper.applyThemeColor(activity);

                        api = account.api;

                        SharedPreferences.Editor editor = sharedpreferences.edit();

                        editor.putString(PREF_USER_TOKEN, account.token);

app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java

+8 −4
Original line number Diff line number Diff line
@@ -132,10 +132,14 @@ public class TimelineHelper { 
                                continue;

                            }

                            String content;

                            try {

                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)

                                    content = Html.fromHtml(status.reblog != null ? status.reblog.content : status.content, Html.FROM_HTML_MODE_LEGACY).toString();

                                else

                                    content = Html.fromHtml(status.reblog != null ? status.reblog.content : status.content).toString();

                            } catch (Exception e) {

                                content = status.reblog != null ? status.reblog.content : status.content;

                            }

                            Matcher m = p.matcher(content);

                            if (m.find()) {

                                status.filteredByApp = filter;