Skip to content

Commit

Permalink
Merge pull request #1479 from ichan-mb/push_notification
Browse files Browse the repository at this point in the history 
Push Notification: fix compatibility with latest Android
  • Loading branch information
@mortend
mortend authored Jul 29, 2023
2 parents 84440e1 + 90b53e3 commit 7a2022f
Show file tree
Hide file tree
Showing 9 changed files with 181 additions and 103 deletions.
5 changes: 5 additions & 0 deletions Source/Fuse.Android.Permissions/AndroidPermissionsInternal.uno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,5 +769,10 @@ namespace Fuse.Android.Permissions.Internal
{
return new PlatformPermission("android.permission.WRITE_VOICEMAIL");
}
[TargetSpecificImplementation]
internal static extern PlatformPermission _post_notification()
{
return new PlatformPermission("android.permission.POST_NOTIFICATIONS");
}
}
}
4 changes: 4 additions & 0 deletions Source/Fuse.Android.Permissions/AndroidPermissionsInternal.uxl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,5 +611,9 @@
<Method Signature="_write_voicemail():Fuse.Android.Permissions.PlatformPermission">
<Require AndroidManifest.Permission="android.permission.WRITE_VOICEMAIL" />
</Method>

<Method Signature="_post_notification():Fuse.Android.Permissions.PlatformPermission">
<Require AndroidManifest.Permission="android.permission.POST_NOTIFICATIONS" />
</Method>
</Type>
</Extensions>
1 change: 1 addition & 0 deletions Source/Fuse.Android.Permissions/Permissions.uno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ namespace Fuse.Android.Permissions
public static PlatformPermission WRITE_SYNC_SETTINGS { get { return Internal.Android._write_sync_settings(); } }
public static PlatformPermission WRITE_USER_DICTIONARY { get { return Internal.Android._write_user_dictionary(); } }
public static PlatformPermission WRITE_VOICEMAIL { get { return Internal.Android._write_voicemail(); } }
public static PlatformPermission POST_NOTIFICATIONS { get { return Internal.Android._post_notification(); } }
}
}

Expand Down
4 changes: 4 additions & 0 deletions Source/Fuse.Android.Permissions/Permissions.uxl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,5 +611,9 @@
<Method Signature="_write_voicemail():Fuse.Android.Permissions.PlatformPermission">
<Require AndroidManifest.Permission="android.permission.WRITE_VOICEMAIL" />
</Method>

<Method Signature="_post_notification():Fuse.Android.Permissions.PlatformPermission">
<Require AndroidManifest.Permission="android.permission.POST_NOTIFICATIONS" />
</Method>
</Type>
</Extensions>
82 changes: 68 additions & 14 deletions Source/Fuse.PushNotifications/Android/Impl.uno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using Fuse;
using Fuse.Controls;
using Fuse.Triggers;
using Fuse.Resources;
using Fuse.Android.Permissions;

using Fuse.Platform;
using Uno.Compiler.ExportTargetInterop;
Expand All @@ -16,6 +17,7 @@ namespace Fuse.PushNotifications
"android.app.Activity",
"android.os.AsyncTask",
"android.app.Notification",
"android.app.PendingIntent",
"android.content.Context",
"android.content.Intent",
"android.media.RingtoneManager",
Expand All @@ -33,7 +35,7 @@ namespace Fuse.PushNotifications
"com.google.android.gms.common.ConnectionResult",
"com.google.android.gms.common.GoogleApiAvailability"
)]
[Require("Gradle.Dependency.Implementation", "com.google.firebase:firebase-messaging:20.0.1")]
[Require("Gradle.Dependency.Implementation", "com.google.firebase:firebase-messaging:23.2.0")]
extern(Android)
internal class AndroidImpl
{
Expand Down Expand Up @@ -71,20 +73,30 @@ namespace Fuse.PushNotifications
// Set up FCM
final Activity activity = com.fuse.Activity.getRootActivity();
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
// Check device for Play Services APK. If check succeeds, proceed with FCM registration.
if (@{CheckPlayServices():Call()}) {

String _regID = com.google.firebase.iid.FirebaseInstanceId.getInstance().getToken();
if (_regID != null) {
@{getRegistrationIdSuccess(string):Call(_regID)};
@Override
public void run() {
// Check device for Play Services APK. If check succeeds, proceed with FCM registration.
if (@{CheckPlayServices():Call()}) {
com.google.firebase.messaging.FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new com.google.android.gms.tasks.OnCompleteListener<String>() {
@Override
public void onComplete(com.google.android.gms.tasks.Task<String> task) {
if (!task.isSuccessful()) {
@{getRegistrationIdError(string):Call(task.getException().toString())};
return;
}
// Get new FCM registration token
String token = task.getResult();
@{getRegistrationIdSuccess(string):Call(token)};
}
} else {
@{getRegistrationIdError(string):Call("Google Play Services need to be updated")};
}
});
} else {
@{getRegistrationIdError(string):Call("Google Play Services need to be updated")};
}
});
}
});
#if (!@(Project.Android.PushNotifications.RegisterOnLaunch:IsSet)) || @(Project.Android.PushNotifications.RegisterOnLaunch:Or(0))
@{RegisterForPushNotifications():Call()};
#endif
@}


Expand All @@ -110,6 +122,38 @@ namespace Fuse.PushNotifications
return true;
@}

[Foreign(Language.Java)]
internal static void RegisterForPushNotifications()
@{
// This is only necessary for API level >= 33 (TIRAMISU)
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
@{RequestPermission():Call()};
}
@}

static void RequestPermission()
{
Permissions.Request(new PlatformPermission[] { Permissions.Android.POST_NOTIFICATIONS}).Then(OnPermissions, OnRejected);
}

static void OnPermissions(PlatformPermission[] grantedPermissions)
{
if(grantedPermissions.Length == 1)
{
// Success
return;
}
else
{
getRegistrationIdError("Push Notification is not granted");
}
}

static void OnRejected(Exception e)
{
getRegistrationIdError(e.Message);
}

[Foreign(Language.Java), ForeignFixedName]
static void RegistrationIDUpdated(string regid)
@{
Expand Down Expand Up @@ -429,7 +473,17 @@ namespace Fuse.PushNotifications
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.setAction(PushNotificationReceiver.ACTION);
intent.replaceExtras(payload);
android.app.PendingIntent pendingIntent = android.app.PendingIntent.getActivity(context, id, intent, android.app.PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent pendingIntent = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S)
{
pendingIntent = android.app.PendingIntent.getActivity
(context, id, intent, android.app.PendingIntent.FLAG_IMMUTABLE | android.app.PendingIntent.FLAG_UPDATE_CURRENT);
}
else
{
pendingIntent = android.app.PendingIntent.getActivity
(context, id, intent, android.app.PendingIntent.FLAG_UPDATE_CURRENT);
}
android.app.NotificationManager notificationManager = (android.app.NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);

/// Setup Default notification channel properties to fallback on
Expand Down
170 changes: 85 additions & 85 deletions Source/Fuse.PushNotifications/Android/PushNotificationReceiver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ public void onMessageReceived(RemoteMessage message)

JSONObject jsonObj = new JSONObject(jsonStr);

jsonStr = jsonObj.toString();
jsonStr = jsonObj.toString();

bundle = jsonStrToBundle(jsonStr);
bundle = jsonStrToBundle(jsonStr);

} catch (JSONException je) {
Log.d("onMessageReceived", "BAD JSON");
Expand All @@ -69,87 +69,87 @@ public void onMessageReceived(RemoteMessage message)
}
}

public static Bundle jsonStrToBundle(String jsonStr) {
Bundle bundle = new Bundle();

try {
JSONObject jsonObject = new JSONObject(jsonStr.trim());
bundle = handleJSONObject(jsonObject);
} catch (JSONException notObject) {
try {
JSONArray jsonArr = new JSONArray(jsonStr.trim());
bundle = handleJSONArray(jsonArr);
} catch (JSONException badJSON) {
Log.d("jsonStrToBundle", "BAD JSON");
}
}

return bundle;
}


public static Bundle handleJSONArray(JSONArray jsonArray) {
Bundle bundle = new Bundle();

for (int i = 0; i < jsonArray.length(); i++) {

try {
Object jsonArrayValue = jsonArray.get(i);

if (jsonArrayValue instanceof JSONObject) {
bundle.putBundle("" + i, handleJSONObject((JSONObject) jsonArrayValue));
} else if (jsonArrayValue instanceof JSONArray) {
bundle.putBundle("" + i, handleJSONArray((JSONArray) jsonArrayValue));
} else if (jsonArrayValue instanceof String) {
bundle.putString("" + i, "" + jsonArrayValue);
} else if (jsonArrayValue instanceof Boolean) {
bundle.putBoolean("" + i, (boolean) jsonArrayValue);
} else if (jsonArrayValue instanceof Integer) {
bundle.putInt("" + i, (int) jsonArrayValue);
} else if (jsonArrayValue instanceof Double) {
bundle.putDouble("" + i, (double) jsonArrayValue);
} else if (jsonArrayValue instanceof Long) {
bundle.putLong("" + i, (long) jsonArrayValue);
}
} catch (JSONException je) {
Log.d("handleJSONArray", "BAD JSON VALUE IN JSON ARRAY, AT POSITION: " + i);
}
}

return bundle;
}

public static Bundle handleJSONObject(JSONObject jsonObject) {
Bundle bundle = new Bundle();

Iterator<String> keys = jsonObject.keys();

while(keys.hasNext()) {
String keyStr = keys.next();

try {
Object keyValue = jsonObject.get(keyStr);

if (keyValue instanceof JSONObject) {
bundle.putBundle(keyStr, handleJSONObject((JSONObject) keyValue));
} else if (keyValue instanceof JSONArray) {
bundle.putBundle(keyStr, handleJSONArray((JSONArray) keyValue));
} else if (keyValue instanceof String) {
bundle.putString(keyStr, "" + keyValue);
} else if (keyValue instanceof Boolean) {
bundle.putBoolean(keyStr, (boolean) keyValue);
} else if (keyValue instanceof Integer) {
bundle.putInt(keyStr, (int) keyValue);
} else if (keyValue instanceof Double) {
bundle.putDouble(keyStr, (double) keyValue);
} else if (keyValue instanceof Long) {
bundle.putLong(keyStr, (long) keyValue);
}
} catch (JSONException je) {
Log.d("handleJSONObject", "BAD JSON VALUE IN JSON OBJECT, AT KEY: " + keyStr);
}
}

return bundle;
}
public static Bundle jsonStrToBundle(String jsonStr) {
Bundle bundle = new Bundle();

try {
JSONObject jsonObject = new JSONObject(jsonStr.trim());
bundle = handleJSONObject(jsonObject);
} catch (JSONException notObject) {
try {
JSONArray jsonArr = new JSONArray(jsonStr.trim());
bundle = handleJSONArray(jsonArr);
} catch (JSONException badJSON) {
Log.d("jsonStrToBundle", "BAD JSON");
}
}

return bundle;
}


public static Bundle handleJSONArray(JSONArray jsonArray) {
Bundle bundle = new Bundle();

for (int i = 0; i < jsonArray.length(); i++) {

try {
Object jsonArrayValue = jsonArray.get(i);

if (jsonArrayValue instanceof JSONObject) {
bundle.putBundle("" + i, handleJSONObject((JSONObject) jsonArrayValue));
} else if (jsonArrayValue instanceof JSONArray) {
bundle.putBundle("" + i, handleJSONArray((JSONArray) jsonArrayValue));
} else if (jsonArrayValue instanceof String) {
bundle.putString("" + i, "" + jsonArrayValue);
} else if (jsonArrayValue instanceof Boolean) {
bundle.putBoolean("" + i, (boolean) jsonArrayValue);
} else if (jsonArrayValue instanceof Integer) {
bundle.putInt("" + i, (int) jsonArrayValue);
} else if (jsonArrayValue instanceof Double) {
bundle.putDouble("" + i, (double) jsonArrayValue);
} else if (jsonArrayValue instanceof Long) {
bundle.putLong("" + i, (long) jsonArrayValue);
}
} catch (JSONException je) {
Log.d("handleJSONArray", "BAD JSON VALUE IN JSON ARRAY, AT POSITION: " + i);
}
}

return bundle;
}

public static Bundle handleJSONObject(JSONObject jsonObject) {
Bundle bundle = new Bundle();

Iterator<String> keys = jsonObject.keys();

while(keys.hasNext()) {
String keyStr = keys.next();

try {
Object keyValue = jsonObject.get(keyStr);

if (keyValue instanceof JSONObject) {
bundle.putBundle(keyStr, handleJSONObject((JSONObject) keyValue));
} else if (keyValue instanceof JSONArray) {
bundle.putBundle(keyStr, handleJSONArray((JSONArray) keyValue));
} else if (keyValue instanceof String) {
bundle.putString(keyStr, "" + keyValue);
} else if (keyValue instanceof Boolean) {
bundle.putBoolean(keyStr, (boolean) keyValue);
} else if (keyValue instanceof Integer) {
bundle.putInt(keyStr, (int) keyValue);
} else if (keyValue instanceof Double) {
bundle.putDouble(keyStr, (double) keyValue);
} else if (keyValue instanceof Long) {
bundle.putLong(keyStr, (long) keyValue);
}
} catch (JSONException je) {
Log.d("handleJSONObject", "BAD JSON VALUE IN JSON OBJECT, AT KEY: " + keyStr);
}
}

return bundle;
}
}
10 changes: 7 additions & 3 deletions Source/Fuse.PushNotifications/Common.uno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ namespace Fuse.PushNotifications

[ForeignInclude(Language.Java,
"android.util.Log",
"com.google.firebase.iid.FirebaseInstanceId",
"java.util.ArrayList",
"java.util.List",
"android.graphics.Color"
)]
[Require("Gradle.Dependency.ClassPath", "com.google.gms:google-services:4.3.2")]
[Require("Gradle.AllProjects.Repository", "maven {url 'https://maven.google.com'}")]
[Require("Gradle.Dependency.Implementation", "com.google.firebase:firebase-analytics:17.2.1")]
[Require("Gradle.Dependency.Implementation", "com.google.firebase:firebase-analytics:21.3.0")]
[Require("Gradle.BuildFile.End", "apply plugin: 'com.google.gms.google-services'")]
public static class PushNotify
{
Expand Down Expand Up @@ -165,7 +164,12 @@ namespace Fuse.PushNotifications
iOSImpl.RegisterForPushNotifications();
}

public extern(!iOS) static void Register() { }
public extern(Android) static void Register()
{
AndroidImpl.RegisterForPushNotifications();
}

public extern(!iOS && !Android) static void Register() { }

public extern(iOS) static bool IsRegisteredForRemoteNotifications()
{
Expand Down
5 changes: 5 additions & 0 deletions Source/Fuse.PushNotifications/Docs/Guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ If you wish to disable auto-registration you can place the following in your uno
"RegisterOnLaunch": false
}
},
"Android": {
"PushNotifications": {
"RegisterOnLaunch": false
}
},
```
You must then register for push notifications by calling `register()` from JS. This option is useful as when the notifications are registered the OS may ask the user for permission to use push notifications and this may be undesirable on launch.

Expand Down
3 changes: 2 additions & 1 deletion Source/Fuse.PushNotifications/Fuse.PushNotifications.unoproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"../Fuse.Elements/Fuse.Elements.unoproj",
"../Fuse.Platform/Fuse.Platform.unoproj",
"../Fuse.Reactive/Fuse.Reactive.unoproj",
"../Fuse.Scripting/Fuse.Scripting.unoproj"
"../Fuse.Scripting/Fuse.Scripting.unoproj",
"../Fuse.Android.Permissions/Fuse.Android.Permissions.unoproj"
],
"Includes": [
"Docs/**:File",
Expand Down

0 comments on commit 7a2022f

Please sign in to comment.