Fix some crashes (da887298) · Commits · Android-smartphones / Fedilab

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

+19 −15

Original line number	Diff line number	Diff line
		@@ -612,6 +612,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		.makeSceneTransitionAnimation(BaseMainActivity.this, headerMainBinding.instanceInfoContainer, getString(R.string.activity_porfile_pp));
		startActivity(intent, options.toBundle());
		});

		headerMainBinding.accountAcc.setOnClickListener(v -> headerMainBinding.changeAccount.callOnClick());
		headerMainBinding.changeAccount.setOnClickListener(v -> {
		headerMenuOpen = !headerMenuOpen;
		@@ -858,12 +859,28 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		MastodonHelper.loadProfileMediaMastodon(headerMainBinding.backgroundImage, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);
		/*
		* Some general data are loaded when the app starts such;
		* - Pinned timelines (in app feature)
		* - Instance info (for limits)
		* - Emoji for picker
		* - Filters for timelines
		* - Pinned timelines (in app feature)

		*/

		//Update pinned timelines
		new ViewModelProvider(BaseMainActivity.this).get(TopBarVM.class).getDBPinned()
		.observe(this, pinned -> {
		this.pinned = pinned;
		//Initialize the slug of the first fragment
		slugOfFirstFragment = PinnedTimelineHelper.firstTimelineSlug(BaseMainActivity.this, pinned, bottomMenu);
		//First it's taken from db (last stored values)
		PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, null);
		//Fetch remote lists for the authenticated account and update them
		new ViewModelProvider(BaseMainActivity.this).get(TimelinesVM.class).getLists(currentInstance, currentToken)
		.observe(this, mastodonLists ->
		PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, mastodonLists)
		);
		});

		//Update emoji in db for the current instance
		new ViewModelProvider(BaseMainActivity.this).get(InstancesVM.class).getEmoji(currentInstance);
		//Retrieve instance info
		@@ -891,20 +908,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		}
		}).start();
		});
		//Update pinned timelines
		new ViewModelProvider(BaseMainActivity.this).get(TopBarVM.class).getDBPinned()
		.observe(this, pinned -> {
		this.pinned = pinned;
		//Initialize the slug of the first fragment
		slugOfFirstFragment = PinnedTimelineHelper.firstTimelineSlug(BaseMainActivity.this, pinned, bottomMenu);
		//First it's taken from db (last stored values)
		PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, null);
		//Fetch remote lists for the authenticated account and update them
		new ViewModelProvider(BaseMainActivity.this).get(TimelinesVM.class).getLists(currentInstance, currentToken)
		.observe(this, mastodonLists ->
		PinnedTimelineHelper.redrawTopBarPinned(BaseMainActivity.this, binding, pinned, bottomMenu, mastodonLists)
		);
		});

		};
		mainHandler.post(myRunnable);
		}).start();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana


		private boolean canBeSent(StatusDraft statusDraft) {
		if (statusDraft == null \|\| statusDraft.statusDraftList == null \|\| statusDraft.statusDraftList.size() == 0) {
		if (statusDraft == null \|\| statusDraft.statusDraftList == null \|\| statusDraft.statusDraftList.isEmpty()) {
		return false;
		}
		Status statusCheck = statusDraft.statusDraftList.get(0);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,7 @@ public class ProfileActivity extends BaseActivity {
		String[] splitAcct = account.acct.split("@");
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ProfileActivity.this);
		AlertDialog.Builder builderInner = null;
		final boolean isOwner = account.id.compareToIgnoreCase(BaseMainActivity.currentUserID) == 0;
		final boolean isOwner = account.id != null && BaseMainActivity.currentUserID != null && account.id.compareToIgnoreCase(BaseMainActivity.currentUserID) == 0;
		final String[] stringArrayConf;
		if (isOwner) {
		stringArrayConf = getResources().getStringArray(R.array.more_action_owner_confirm);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public class CrossActionHelper {
		} else if (targetedStatus != null) {
		searchVM.search(ownerAccount.instance, ownerAccount.token, targetedStatus.uri, null, "statuses", false, true, false, 0, null, null, 1)
		.observe((LifecycleOwner) context, results -> {
		if (results.statuses != null && results.statuses.size() > 0) {
		if (results != null && results.statuses != null && results.statuses.size() > 0) {
		Status status = results.statuses.get(0);
		applyAction(context, actionType, ownerAccount, null, status);
		} else {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ public class Helper {
		public static final String ARG_MEDIA_ATTACHMENT = "ARG_MEDIA_ATTACHMENT";
		public static final String ARG_SHOW_REPLIES = "ARG_SHOW_REPLIES";
		public static final String ARG_SHOW_REBLOGS = "ARG_SHOW_REBLOGS";

		public static final String ARG_INITIALIZE_VIEW = "ARG_INITIALIZE_VIEW";
		public static final String ARG_SHOW_PINNED = "ARG_SHOW_PINNED";
		public static final String ARG_SHOW_MEDIA_ONY = "ARG_SHOW_MEDIA_ONY";
		public static final String ARG_MENTION = "ARG_MENTION";