You've already forked android_translation_layer
mirror of
https://gitlab.com/android_translation_layer/android_translation_layer.git
synced 2025-10-27 11:48:10 -07:00
NotificationManager: check for null before adding an action button
This commit is contained in:
@@ -96,7 +96,9 @@ JNIEXPORT void JNICALL Java_android_app_NotificationManager_nativeAddAction(JNIE
|
|||||||
const char *name = "";
|
const char *name = "";
|
||||||
if (name_jstr)
|
if (name_jstr)
|
||||||
name = (*env)->GetStringUTFChars(env, name_jstr, NULL);
|
name = (*env)->GetStringUTFChars(env, name_jstr, NULL);
|
||||||
g_notification_add_button_with_target_value(notification, name, intent_actionname_from_type(type), intent_serialize(env, intent));
|
const char *action = intent_actionname_from_type(type);
|
||||||
|
if (action)
|
||||||
|
g_notification_add_button_with_target_value(notification, name, action, intent_serialize(env, intent));
|
||||||
if (name_jstr)
|
if (name_jstr)
|
||||||
(*env)->ReleaseStringUTFChars(env, name_jstr, name);
|
(*env)->ReleaseStringUTFChars(env, name_jstr, name);
|
||||||
}
|
}
|
||||||
@@ -129,7 +131,9 @@ JNIEXPORT void JNICALL Java_android_app_NotificationManager_nativeShowNotificati
|
|||||||
g_free(icon_path_full);
|
g_free(icon_path_full);
|
||||||
(*env)->ReleaseStringUTFChars(env, icon_jstr, icon_path);
|
(*env)->ReleaseStringUTFChars(env, icon_jstr, icon_path);
|
||||||
}
|
}
|
||||||
g_notification_set_default_action_and_target_value(notification, intent_actionname_from_type(type), intent_serialize(env, intent));
|
const char *action = intent_actionname_from_type(type);
|
||||||
|
if (action)
|
||||||
|
g_notification_set_default_action_and_target_value(notification, action, intent_serialize(env, intent));
|
||||||
queue_notification(id, notification);
|
queue_notification(id, notification);
|
||||||
if (ongoing)
|
if (ongoing)
|
||||||
g_hash_table_add(ongoing_notifications, GINT_TO_POINTER(id));
|
g_hash_table_add(ongoing_notifications, GINT_TO_POINTER(id));
|
||||||
|
|||||||
Reference in New Issue
Block a user