owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Botiplz
2023-07-22 19:50:58 +02:00
parent 6ed7d24513
commit ae5d2a7ed3
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
View File

@@ -32,8 +32,8 @@ public class StatusFilterPredicate implements Predicate<Status> {
/** /**
* @param context null makes the predicate pass automatically * @param context null makes the predicate pass automatically
* @param action defines what the predicate should check: * @param action defines what the predicate should check:
* status should not be hidden or should not display with warning * status should not be hidden or should not display with warning
*/ */
public StatusFilterPredicate(List<Filter> filters, Filter.FilterContext context, Filter.FilterAction action) { public StatusFilterPredicate(List<Filter> filters, Filter.FilterContext context, Filter.FilterAction action) {
this.filters = filters; this.filters = filters;
@@ -49,8 +49,8 @@ public class StatusFilterPredicate implements Predicate<Status> {
/** /**
* @param context null makes the predicate pass automatically * @param context null makes the predicate pass automatically
* @param action defines what the predicate should check: * @param action defines what the predicate should check:
* status should not be hidden or should not display with warning * status should not be hidden or should not display with warning
*/ */
public StatusFilterPredicate(String accountID, Filter.FilterContext context, Filter.FilterAction action) { public StatusFilterPredicate(String accountID, Filter.FilterContext context, Filter.FilterAction action) {
this(AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f -> f.context.contains(context)).collect(Collectors.toList()), this(AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f -> f.context.contains(context)).collect(Collectors.toList()),
@@ -67,9 +67,9 @@ public class StatusFilterPredicate implements Predicate<Status> {
/** /**
* @return whether the status should be displayed without being hidden/warned about. * @return whether the status should be displayed without being hidden/warned about.
* will always return true if the context is null. * will always return true if the context is null.
* true = display this status, * true = display this status,
* false = filter this status * false = filter this status
*/ */
@Override @Override
public boolean test(Status status) { public boolean test(Status status) {

1
mastodon/src/main/res/values-de-rDE/strings_mo.xml
View File

@@ -77,5 +77,4 @@
<string name="mo_setting_play_gif_summary">GIFs in Profilbildern und Emojis automatisch abspielen</string> <string name="mo_setting_play_gif_summary">GIFs in Profilbildern und Emojis automatisch abspielen</string>
<string name="mo_settings_show_posts_without_alt">Zeige Medienbeiträge ohne Bildbeschreibung</string> <string name="mo_settings_show_posts_without_alt">Zeige Medienbeiträge ohne Bildbeschreibung</string>
<string name="mo_settings_show_posts_without_alt_summary">Beiräge werden in allen Timelines ausgeblendet, können aber in Threads und Benachrichtungen ausgeklappt werden</string> <string name="mo_settings_show_posts_without_alt_summary">Beiräge werden in allen Timelines ausgeblendet, können aber in Threads und Benachrichtungen ausgeklappt werden</string>
</resources> </resources>

1
mastodon/src/main/res/values/strings_mo.xml
View File

@@ -88,7 +88,6 @@
<string name="mo_setting_haptic_feedback_summary">Vibrate when interacting with posts</string> <string name="mo_setting_haptic_feedback_summary">Vibrate when interacting with posts</string>
<string name="mo_swap_bookmark_with_reblog_summary">Bookmark or reblog posts from the notification</string> <string name="mo_swap_bookmark_with_reblog_summary">Bookmark or reblog posts from the notification</string>
<string name="mo_settings_show_posts_without_alt_summary">Posts will be hidden in all timelines, but can be revealed in threads and notifications</string> <string name="mo_settings_show_posts_without_alt_summary">Posts will be hidden in all timelines, but can be revealed in threads and notifications</string>
<!-- Settings --> <!-- Settings -->
<string name="mo_notification_audience_settings">Notification Audience</string> <string name="mo_notification_audience_settings">Notification Audience</string>
<string name="mo_settings_show_posts_without_alt">Show media posts with missing alt text</string> <string name="mo_settings_show_posts_without_alt">Show media posts with missing alt text</string>