chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Confirm blocks and mutes from timelines (#1740)

Browse source 
* Add preference for confirming blocks and mutes from timelines
Implements #1737

* Apply code review feedback
This commit is contained in:
Levi Bard 2020-03-30 21:03:27 +02:00 • committed by GitHub
commit 91263eed8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View file

@ -39,6 +39,7 @@ import androidx.appcompat.widget.PopupMenu;
import androidx.core.app.ActivityOptionsCompat;
import androidx.core.view.ViewCompat;
import androidx.lifecycle.Lifecycle;
import androidx.preference.PreferenceManager;
import com.keylesspalace.tusky.BaseActivity;
import com.keylesspalace.tusky.BottomSheetActivity;
@ -284,11 +285,11 @@ public abstract class SFragment extends BaseFragment implements Injectable {
return true;
}
case R.id.status_mute: {
timelineCases.mute(accountId);
onMute(accountId, accountUsername);
return true;
}
case R.id.status_block: {
timelineCases.block(accountId);
onBlock(accountId, accountUsername);
return true;
}
case R.id.status_report: {
@ -328,6 +329,22 @@ public abstract class SFragment extends BaseFragment implements Injectable {
popup.show();
}
private void onMute(String accountId, String accountUsername) {
new AlertDialog.Builder(requireContext())
.setMessage(getString(R.string.dialog_mute_warning, accountUsername))
.setPositiveButton(android.R.string.ok, (__, ___) -> timelineCases.mute(accountId))
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private void onBlock(String accountId, String accountUsername) {
new AlertDialog.Builder(requireContext())
.setMessage(getString(R.string.dialog_block_warning, accountUsername))
.setPositiveButton(android.R.string.ok, (__, ___) -> timelineCases.block(accountId))
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private static boolean accountIsInMentions(AccountEntity account, Status.Mention[] mentions) {
if (account == null) {
return false;