Some fixes (e32101a6) · Commits · Android-smartphones / Fedilab

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -747,13 +747,11 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		itemFilter.setTitle(show_filtered);
		}
		popup.setOnDismissListener(menu1 -> {
		if (binding.viewPager.getAdapter() != null) {
		Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());
		if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
		FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
		fragmentMastodonTimeline.refreshAllAdapters();
		}
		}
		});
		String finalShow_filtered = show_filtered;
		popup.setOnMenuItemClickListener(item -> {

app/src/main/java/app/fedilab/android/client/entities/app/Account.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,7 @@ public class Account extends BaseAccount implements Serializable {
		throw new DBException("db is null. Wrong initialization.");
		}
		try {
		Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_API + " = 'MASTODON'", null, null, null, null, null);
		Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, null, null, null, null, null, null);
		return cursorToListUser(c);
		} catch (Exception e) {
		return null;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class CrossActionHelper {
		AlertDialog.Builder builderSingle = new AlertDialog.Builder(context, Helper.dialogStyle());
		builderSingle.setTitle(context.getString(R.string.choose_accounts));
		final AccountsSearchAdapter accountsSearchAdapter = new AccountsSearchAdapter(context, accountList);
		final BaseAccount[] accountArray = new Account[accounts.size()];
		final BaseAccount[] accountArray = new BaseAccount[accounts.size()];
		int i = 0;
		for (BaseAccount account : accounts) {
		accountArray[i] = account;

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

+23 −32

Original line number	Diff line number	Diff line
		@@ -312,7 +312,6 @@ public class PinnedTimelineHelper {
		popup.setOnDismissListener(menu1 -> {
		if (changes[0]) {
		FragmentMastodonTimeline fragmentMastodonTimeline;
		if (activityMainBinding.viewPager.getAdapter() != null) {
		Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
		if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
		fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
		@@ -327,8 +326,6 @@ public class PinnedTimelineHelper {
		fragTransaction2.commit();
		}
		}

		}
		});


		@@ -529,12 +526,10 @@ public class PinnedTimelineHelper {
		});
		changes[0] = true;
		FragmentMastodonTimeline fragmentMastodonTimeline = null;
		if (activityMainBinding.viewPager.getAdapter() != null) {
		Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
		if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
		fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
		}
		}
		if (fragmentMastodonTimeline == null)
		return false;
		FragmentTransaction fragTransaction1 = activity.getSupportFragmentManager().beginTransaction();
		@@ -576,13 +571,11 @@ public class PinnedTimelineHelper {
		MenuItem item = popup.getMenu().add(0, 0, Menu.NONE, title);
		item.setOnMenuItemClickListener(item1 -> {
		FragmentMastodonTimeline fragmentMastodonTimeline = null;
		if (activityMainBinding.viewPager.getAdapter() != null) {
		Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
		if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
		fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
		fragmentMastodonTimeline.refreshAllAdapters();
		}
		}
		FragmentTransaction fragTransaction1 = activity.getSupportFragmentManager().beginTransaction();
		if (fragmentMastodonTimeline == null)
		return false;
		@@ -659,13 +652,11 @@ public class PinnedTimelineHelper {
		popup.setOnDismissListener(menu -> {
		if (changes[0]) {
		FragmentMastodonTimeline fragmentMastodonTimeline = null;
		if (activityMainBinding.viewPager.getAdapter() != null) {
		Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
		if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
		fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
		fragmentMastodonTimeline.refreshAllAdapters();
		}
		}
		FragmentTransaction fragTransaction1 = activity.getSupportFragmentManager().beginTransaction();
		if (fragmentMastodonTimeline == null)
		return;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ public class SpannableHelper {
		content.setSpan(new LongClickableSpan() {
		@Override
		public void onLongClick(View view) {
		AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(view.getContext(), Helper.dialogStyle());
		AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, Helper.dialogStyle());
		PopupLinksBinding popupLinksBinding = PopupLinksBinding.inflate(LayoutInflater.from(context));
		dialogBuilder.setView(popupLinksBinding.getRoot());
		AlertDialog alertDialog = dialogBuilder.create();