Register push tokens with the 5calls API instead of OneSignal #321
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package org.a5calls.android.a5calls.net | ||
|
|
||
| import android.app.Notification | ||
| import android.app.NotificationChannel | ||
| import android.app.NotificationManager | ||
| import android.app.PendingIntent | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.os.Build | ||
| import android.util.Log | ||
| import androidx.core.content.ContextCompat | ||
| import com.google.firebase.messaging.FirebaseMessagingService | ||
| import com.google.firebase.messaging.RemoteMessage | ||
| import org.a5calls.android.a5calls.R | ||
| import org.a5calls.android.a5calls.controller.MainActivity | ||
|
|
||
| /** | ||
| * Receives push notifications from FCM and shows them. OneSignal's SDK used to | ||
| * do both the token handling and the display; this does the same work against | ||
|
Collaborator
There was a problem hiding this comment. again remove reference to onesignal, but fine to keep "this does token handling and display" |
||
| * our own Firebase project and our own API. | ||
| */ | ||
| class FiveCallsMessagingService : FirebaseMessagingService() { | ||
| companion object { | ||
| private const val TAG = "FiveCallsMessaging" | ||
|
|
||
| /** | ||
| * Separate from the call reminder channel so people can silence vote | ||
| * alerts without losing their own reminders. | ||
| */ | ||
| const val CHANNEL_ID = "5calls_push_channel" | ||
|
|
||
| private const val NOTIFICATION_ID = 8288 | ||
|
|
||
| /** Custom data the API sends so a tap can open the right message. */ | ||
| const val MESSAGE_ID_KEY = "messageid" | ||
| } | ||
|
|
||
| /** | ||
| * FCM hands us a new token on install, reinstall, restore, and whenever it | ||
| * decides to rotate one. Passing it straight to the API is what keeps our | ||
| * token list from going stale. | ||
| */ | ||
| override fun onNewToken(token: String) { | ||
| super.onNewToken(token) | ||
| PushRegistration.register(applicationContext, token) | ||
| } | ||
|
|
||
| override fun onMessageReceived(message: RemoteMessage) { | ||
| super.onMessageReceived(message) | ||
|
|
||
| // notifications from our API carry a notification block; fall back to | ||
| // the data payload so a data-only send still shows something | ||
| val title = message.notification?.title ?: message.data["title"] | ||
| val body = message.notification?.body ?: message.data["body"] | ||
|
|
||
| if (title.isNullOrEmpty() && body.isNullOrEmpty()) { | ||
| Log.w(TAG, "push with no title or body, nothing to show") | ||
| return | ||
| } | ||
|
|
||
| showNotification(title, body, message.data[MESSAGE_ID_KEY]) | ||
| } | ||
|
|
||
| private fun showNotification(title: String?, body: String?, messageId: String?) { | ||
|
Collaborator
There was a problem hiding this comment. what happens if one of these shows at the same time as the reminder is showing? would the user see 2 at the same time, would the most recent one win, a crash? |
||
| createChannel() | ||
|
|
||
| val intent = Intent(this, MainActivity::class.java).apply { | ||
| putExtra(MainActivity.EXTRA_FROM_NOTIFICATION, true) | ||
|
Collaborator
There was a problem hiding this comment. Optional: we could consider a different extra to track reminders (which currently use extra_from_notification) and these one-off alerts. Would allow us to differentiate in Plausible. |
||
| if (!messageId.isNullOrEmpty()) { | ||
| putExtra(MESSAGE_ID_KEY, messageId) | ||
| } | ||
| } | ||
|
|
||
| val pendingIntent = PendingIntent.getActivity( | ||
| this, | ||
| MainActivity.NOTIFICATION_REQUEST, | ||
| intent, | ||
| PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT | ||
| ) | ||
|
|
||
| val builder = Notification.Builder(this) | ||
| .setContentTitle(title ?: getString(R.string.app_name)) | ||
| .setContentText(body) | ||
| .setStyle(Notification.BigTextStyle().bigText(body)) | ||
| .setContentIntent(pendingIntent) | ||
| .setAutoCancel(true) | ||
| .setSmallIcon(R.drawable.app_icon_bw) | ||
|
|
||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { | ||
| builder.setChannelId(CHANNEL_ID) | ||
| } | ||
|
|
||
| builder.setColor(ContextCompat.getColor(this, R.color.colorPrimary)) | ||
|
|
||
| val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager | ||
| manager.notify(NOTIFICATION_ID, builder.build()) | ||
| } | ||
|
|
||
| private fun createChannel() { | ||
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { | ||
| return | ||
| } | ||
|
|
||
| val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager | ||
| val channel = NotificationChannel( | ||
| CHANNEL_ID, | ||
| getString(R.string.push_notification_channel_name), | ||
| NotificationManager.IMPORTANCE_DEFAULT | ||
| ) | ||
|
|
||
| manager.createNotificationChannel(channel) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this need to change anything about the privacy statement we link to from play store, https://5calls.org/privacy/?