Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ of this software and associated documentation files (the "Software"), to deal
import com.onesignal.Continue;
import com.onesignal.OneSignal;
import com.onesignal.debug.LogLevel;
import com.onesignal.common.OneSignalWrapper;
import com.onesignal.inAppMessages.IInAppMessage;
import com.onesignal.inAppMessages.IInAppMessageClickListener;
import com.onesignal.inAppMessages.IInAppMessageClickEvent;
Expand Down Expand Up @@ -214,6 +215,8 @@ public void onCatalystInstanceDestroy() {
@ReactMethod
public void initialize(String appId) {
Context context = mReactApplicationContext.getCurrentActivity();
OneSignalWrapper.setSdkType("reactnative");
OneSignalWrapper.setSdkVersion("050000");

if (oneSignalInitDone) {
Log.e("OneSignal", "Already initialized the OneSignal React-Native SDK");
Expand Down
2 changes: 1 addition & 1 deletion examples/RNOneSignalTS/src/OSButtons.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {OneSignal, OutcomeEvent} from 'react-native-onesignal';
import {OneSignal} from 'react-native-onesignal';
import * as React from 'react';
import {StyleSheet, View, Platform} from 'react-native';
import {renderButtonView} from './Helpers';
Expand Down
2 changes: 2 additions & 0 deletions ios/RCTOneSignal/RCTOneSignal.m
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ - (void)setLaunchOptions:(NSDictionary *)launchOptions {
if (didInitialize)
return;

OneSignalWrapper.sdkType = @"reactnative";
OneSignalWrapper.sdkVersion = @"050000";
[OneSignal setLaunchOptions:launchOptions];
didInitialize = true;
}
Expand Down
5 changes: 5 additions & 0 deletions src/events/EventManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ export default class EventManager {
new NotificationWillDisplayEvent(payload as OSNotification),
);
});
} else if (eventName === PERMISSION_CHANGED) {
const typedPayload = payload as { permission: boolean };
handlerArray.forEach((handler) => {
handler(typedPayload.permission);
});
} else {
handlerArray.forEach((handler) => {
handler(payload);
Expand Down
7 changes: 4 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
PushSubscriptionChangedState,
} from './models/Subscription';
import NotificationWillDisplayEvent from './events/NotificationWillDisplayEvent';
import { OutcomeEvent } from './models/Outcomes';
import {
InAppMessage,
InAppMessageEventTypeMap,
Expand Down Expand Up @@ -791,9 +790,11 @@ export {
InAppMessageDidDisplayEvent,
InAppMessageWillDismissEvent,
InAppMessageDidDismissEvent,
OutcomeEvent,
PushSubscriptionState,
PushSubscriptionChangedState,
OSNotificationPermission,
};

export { default as OSNotification } from './OSNotification';
export { NotificationClickResult } from './models/NotificationEvents';
export { OSNotificationPermission } from './models/Subscription';
export { InAppMessageClickResult } from './models/InAppMessage';
7 changes: 0 additions & 7 deletions src/models/Outcomes.ts

This file was deleted.