Add less restrictive catch close (9047181e) · Commits · Android-smartphones / Fedilab

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

+30 −12

Original line number	Diff line number	Diff line
		@@ -173,9 +173,14 @@ public class AdminReportActivity extends BaseActivity {
		if (adminAccount.disabled) {
		adminVM.enable(MainActivity.currentInstance, MainActivity.currentToken, account.id)
		.observe(AdminReportActivity.this, adminAccountResult -> {
		if (adminAccountResult != null) {
		adminAccount.disabled = false;
		binding.disableAction.setText(R.string.disable);
		binding.disabled.setText(R.string.no);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}

		});
		} else {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "disable ", null, null, null, null);
		@@ -189,9 +194,14 @@ public class AdminReportActivity extends BaseActivity {
		if (adminAccount.approved) {
		adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account.id)
		.observe(AdminReportActivity.this, adminAccountResult -> {
		if (adminAccountResult != null) {
		adminAccount.approved = false;
		binding.approveAction.setText(R.string.approve);
		binding.approved.setText(R.string.no);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}

		});
		} else {
		adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account.id);
		@@ -205,9 +215,13 @@ public class AdminReportActivity extends BaseActivity {
		if (adminAccount.disabled) {
		adminVM.unsilence(MainActivity.currentInstance, MainActivity.currentToken, account.id)
		.observe(AdminReportActivity.this, adminAccountResult -> {
		if (adminAccountResult != null) {
		adminAccount.silenced = false;
		binding.silenceAction.setText(R.string.silence);
		binding.disabled.setText(R.string.no);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "silence", null, null, null, null);
		@@ -221,9 +235,13 @@ public class AdminReportActivity extends BaseActivity {
		if (adminAccount.disabled) {
		adminVM.unsuspend(MainActivity.currentInstance, MainActivity.currentToken, account.id)
		.observe(AdminReportActivity.this, adminAccountResult -> {
		if (adminAccountResult != null) {
		adminAccount.suspended = false;
		binding.suspendAction.setText(R.string.suspend);
		binding.suspended.setText(R.string.no);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account.id, "suspend", null, null, null, null);

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -178,10 +178,18 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		if (statusReplyId != null && statusDraft != null) {//Delete and redraft
		statusesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusReplyId)
		.observe(ComposeActivity.this, status1 -> {
		if (status1 != null) {
		statusesVM.getContext(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusReplyId)
		.observe(ComposeActivity.this, statusContext -> {
		if (statusContext != null) {
		initializeContextRedraftView(statusContext, status1);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else if (statusDraft != null) {//Restore a draft with all messages
		new Thread(() -> {

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

+51 −36

Original line number	Diff line number	Diff line
		@@ -73,8 +73,12 @@ public class EditProfileActivity extends BaseActivity {

		new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class).getConnectedAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken)
		.observe(EditProfileActivity.this, account -> {
		if (account != null) {
		BaseMainActivity.accountWeakReference.get().mastodon_account = account;
		initializeView();
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		}

		@@ -187,6 +191,7 @@ public class EditProfileActivity extends BaseActivity {
		.into(binding.accountPp);
		accountsVM.updateProfilePicture(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, data.getData(), AccountsVM.UpdateMediaType.AVATAR)
		.observe(EditProfileActivity.this, account -> {
		if (account != null) {
		sendBroadCast(account);
		binding.avatarProgress.setVisibility(View.GONE);
		BaseMainActivity.accountWeakReference.get().mastodon_account = account;
		@@ -198,6 +203,9 @@ public class EditProfileActivity extends BaseActivity {
		e.printStackTrace();
		}
		}).start();
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else if (requestCode == PICK_MEDIA_HEADER && resultCode == RESULT_OK) {
		Glide.with(EditProfileActivity.this)
		@@ -208,6 +216,7 @@ public class EditProfileActivity extends BaseActivity {
		binding.headerProgress.setVisibility(View.VISIBLE);
		accountsVM.updateProfilePicture(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, data.getData(), AccountsVM.UpdateMediaType.HEADER)
		.observe(EditProfileActivity.this, account -> {
		if (account != null) {
		sendBroadCast(account);
		binding.headerProgress.setVisibility(View.GONE);
		BaseMainActivity.accountWeakReference.get().mastodon_account = account;
		@@ -218,8 +227,10 @@ public class EditProfileActivity extends BaseActivity {
		e.printStackTrace();
		}
		}).start();

		Helper.recreateMainActivity(EditProfileActivity.this);
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		}
		}
		@@ -301,6 +312,7 @@ public class EditProfileActivity extends BaseActivity {
		getFields()
		)
		.observe(EditProfileActivity.this, account -> {
		if (account != null) {
		BaseMainActivity.accountWeakReference.get().mastodon_account = account;
		new Thread(() -> {
		try {
		@@ -310,9 +322,12 @@ public class EditProfileActivity extends BaseActivity {
		e.printStackTrace();
		}
		}).start();

		Toasty.success(EditProfileActivity.this, getString(R.string.profiled_updated), Toasty.LENGTH_LONG).show();
		finish();
		} else {
		Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}

		});
		return true;
		}

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -627,8 +627,11 @@ public class SpannableHelper {
		* @param text String - text to convert, it can be display name or bio
		* @return Spannable string
		*/
		private static Spannable convertA(@NonNull Context context, @NonNull Account account, @NonNull String text, boolean limitedToDisplayName) {
		private static Spannable convertA(@NonNull Context context, @NonNull Account account, String text, boolean limitedToDisplayName) {
		SpannableString initialContent;
		if (text == null) {
		return null;
		}
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
		initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY));
		else

app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginPickInstanceMastodon.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ public class FragmentLoginPickInstanceMastodon extends Fragment implements Insta
		binding.regCategoryView.setLayoutManager(mLayoutManager);
		binding.regCategoryView.setNestedScrollingEnabled(false);
		binding.regCategoryView.setAdapter(instanceRegAdapter);
		} else {
		Helper.sendToastMessage(requireActivity(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
		}
		});
		} else {