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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -697,7 +697,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		new ViewModelProvider(BaseMainActivity.this).get(AccountsVM.class).getConnectedAccount(currentInstance, currentToken)
		.observe(BaseMainActivity.this, mastodonAccount -> {
		//Initialize static var
		if (mastodonAccount != null) {
		if (mastodonAccount != null && currentAccount != null) {
		currentAccount.mastodon_account = mastodonAccount;
		displayReleaseNotesIfNeeded(BaseMainActivity.this, false);
		new Thread(() -> {

+6 −2

Original line number	Diff line number	Diff line
		@@ -870,10 +870,14 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana


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

+14 −9

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public class LoginActivity extends BaseActivity {
		//API call to retrieve account information for the new token
		AccountsVM accountsVM = new ViewModelProvider(LoginActivity.this).get(AccountsVM.class);
		accountsVM.getConnectedAccount(currentInstanceLogin, account.token).observe(LoginActivity.this, mastodonAccount -> {
		if (mastodonAccount != null) {
		account.mastodon_account = mastodonAccount;
		account.user_id = mastodonAccount.id;
		//We check if user have really moderator rights
		@@ -123,6 +124,10 @@ public class LoginActivity extends BaseActivity {
		} else {
		proceedLogin(LoginActivity.this, account);
		}
		} else {
		Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();
		}

		});
		} else {
		Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();

+13 −9

Original line number	Diff line number	Diff line
		@@ -903,6 +903,7 @@ public class ProfileActivity extends BaseActivity {
		if (relationship == null \|\| !relationship.following) {
		accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)
		.observe(ProfileActivity.this, newRelationShip -> {
		if (newRelationShip != null) {
		relationship = newRelationShip;
		updateAccount();
		if (isChecked) {
		@@ -914,6 +915,9 @@ public class ProfileActivity extends BaseActivity {
		} else {
		timelinesVM.deleteAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds);
		}
		} else {
		Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show();
		}
		});
		} else {
		if (isChecked) {

+3 −1

Original line number	Diff line number	Diff line
		@@ -854,7 +854,9 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		//It only targets last message in a thread
		//Return content of last compose message
		public String getLastComposeContent() {
		if (currentCursorPosition < statusList.size()) {
		return statusList.get(currentCursorPosition).text != null ? statusList.get(currentCursorPosition).text : "";
		} else return "";
		}
		//------- end contact ----->