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

add push post notifications

Browse Source 
closes #93
This commit is contained in:
sk
2022-12-07 14:50:24 +01:00
parent 9a085beea8
commit b190480d77
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -144,6 +144,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked))); items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked)));
items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked))); items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked)));
items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_at_symbol, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked))); items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_at_symbol, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
items.add(new HeaderItem(R.string.settings_boring)); items.add(new HeaderItem(R.string.settings_boring));
items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"))); items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
@@ -293,6 +294,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case FOLLOW -> subscription.alerts.follow=enabled; case FOLLOW -> subscription.alerts.follow=enabled;
case REBLOG -> subscription.alerts.reblog=enabled; case REBLOG -> subscription.alerts.reblog=enabled;
case MENTION -> subscription.alerts.mention=subscription.alerts.poll=enabled; case MENTION -> subscription.alerts.mention=subscription.alerts.poll=enabled;
case STATUS -> subscription.alerts.status=enabled;
} }
needUpdateNotificationSettings=true; needUpdateNotificationSettings=true;
} }

4
mastodon/src/main/java/org/joinmastodon/android/model/PushNotification.java
View File

@@ -43,7 +43,9 @@ public class PushNotification extends BaseModel{
@SerializedName("follow") @SerializedName("follow")
FOLLOW(R.string.notification_type_follow), FOLLOW(R.string.notification_type_follow),
@SerializedName("poll") @SerializedName("poll")
POLL(R.string.notification_type_poll); POLL(R.string.notification_type_poll),
@SerializedName("status")
STATUS(R.string.sk_notification_type_status);
@StringRes @StringRes
public final int localizedName; public final int localizedName;

4
mastodon/src/main/java/org/joinmastodon/android/model/PushSubscription.java
View File

@@ -43,10 +43,11 @@ public class PushSubscription extends BaseModel implements Cloneable{
public boolean reblog; public boolean reblog;
public boolean mention; public boolean mention;
public boolean poll; public boolean poll;
public boolean status;
public static Alerts ofAll(){ public static Alerts ofAll(){
Alerts alerts=new Alerts(); Alerts alerts=new Alerts();
alerts.follow=alerts.favourite=alerts.reblog=alerts.mention=alerts.poll=true; alerts.follow=alerts.favourite=alerts.reblog=alerts.mention=alerts.poll=alerts.status=true;
return alerts; return alerts;
} }
@@ -58,6 +59,7 @@ public class PushSubscription extends BaseModel implements Cloneable{
", reblog="+reblog+ ", reblog="+reblog+
", mention="+mention+ ", mention="+mention+
", poll="+poll+ ", poll="+poll+
", status="+status+
'}'; '}';
} }

2
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -38,4 +38,6 @@
<string name="sk_disable_marquee">Disable scrolling text in title bars</string> <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
<string name="sk_settings_contribute">Contribute to Megalodon</string> <string name="sk_settings_contribute">Contribute to Megalodon</string>
<string name="sk_settings_show_federated_timeline">Show federated timeline</string> <string name="sk_settings_show_federated_timeline">Show federated timeline</string>
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notify_posts">Post notifications</string>
</resources> </resources>