Skip to content

Commit 95fd7c1

Browse files
brismithersbrismithers
authored
Merge pull request #1685 from OneSignal/user-model/renames-and-moves
[User Model] Move and rename
2 parents 460a7d6 + edb2c18 commit 95fd7c1

File tree

266 files changed

+1565
-1225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+1565
-1225
lines changed

‎Examples/OneSignalDemo/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ dependencies {
6969

7070
implementation('com.onesignal:OneSignal:4.8.2')
7171
implementation('com.onesignal:Location:4.8.2')
72-
implementation('com.onesignal:IAM:4.8.2')
72+
implementation('com.onesignal:InAppMessages:4.8.2')
7373

7474
/** START - Google Play Builds **/
75-
gmsImplementation('com.onesignal:Notification:4.8.2')
75+
gmsImplementation('com.onesignal:Notifications:4.8.2')
7676
/** END - Google Play Builds **/
7777

7878
/** START - Huawei Builds **/
7979
// Omit Google / Firebase libraries for Huawei builds.
80-
huaweiImplementation('com.onesignal:Notification:4.8.2') {
80+
huaweiImplementation('com.onesignal:Notifications:4.8.2') {
8181
exclude group: 'com.google.android.gms', module: 'play-services-gcm'
8282
exclude group: 'com.google.android.gms', module: 'play-services-analytics'
8383
exclude group: 'com.google.android.gms', module: 'play-services-location'

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import androidx.multidex.MultiDexApplication;
99

1010
import com.onesignal.OneSignal;
11-
import com.onesignal.iam.IInAppMessage;
12-
import com.onesignal.iam.IInAppMessageAction;
13-
import com.onesignal.iam.IInAppMessageClickHandler;
14-
import com.onesignal.iam.IInAppMessageLifecycleHandler;
11+
import com.onesignal.inAppMessages.IInAppMessage;
12+
import com.onesignal.inAppMessages.IInAppMessageAction;
13+
import com.onesignal.inAppMessages.IInAppMessageClickHandler;
14+
import com.onesignal.inAppMessages.IInAppMessageLifecycleHandler;
1515
import com.onesignal.debug.LogLevel;
16-
import com.onesignal.notification.INotification;
16+
import com.onesignal.notifications.INotification;
1717
import com.onesignal.sdktest.BuildConfig;
1818
import com.onesignal.sdktest.R;
1919
import com.onesignal.sdktest.constant.Tag;
@@ -45,7 +45,7 @@ public void onCreate() {
4545

4646
OneSignal.initWithContext(this, appId);
4747

48-
OneSignal.getIam().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
48+
OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
4949
@Override
5050
public void onWillDisplayInAppMessage(@NonNull IInAppMessage message) {
5151
Log.v("MainApplication", "onWillDisplayInAppMessage");
@@ -67,7 +67,7 @@ public void onDidDismissInAppMessage(@NonNull IInAppMessage message) {
6767
}
6868
});
6969

70-
OneSignal.getIam().setInAppMessageClickHandler(new IInAppMessageClickHandler() {
70+
OneSignal.getInAppMessages().setInAppMessageClickHandler(new IInAppMessageClickHandler() {
7171
@Override
7272
public void inAppMessageClicked(@Nullable IInAppMessageAction result) {
7373
Log.v("MainApplication", "inAppMessageClicked");
@@ -91,7 +91,7 @@ public void inAppMessageClicked(@Nullable IInAppMessageAction result) {
9191
});
9292

9393
OneSignal.getNotifications().setUnsubscribeWhenNotificationsAreDisabled(true);
94-
OneSignal.getIam().setPaused(true);
94+
OneSignal.getInAppMessages().setPaused(true);
9595
OneSignal.getLocation().setLocationShared(false);
9696

9797
Log.d(Tag.DEBUG, Text.ONESIGNAL_SDK_INIT);

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/ActivityViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Context;
55
import androidx.appcompat.app.AppCompatActivity;
66

7-
import com.onesignal.notification.IPermissionChangedHandler;
7+
import com.onesignal.notifications.IPermissionChangedHandler;
88

99
/**
1010
* This is the interface created with a few generic methods for setting a ViewModel

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import com.onesignal.Continue;
2828
import com.onesignal.OneSignal;
29-
import com.onesignal.notification.IPermissionStateChanges;
29+
import com.onesignal.notifications.IPermissionStateChanges;
3030
import com.onesignal.user.subscriptions.IEmailSubscription;
3131
import com.onesignal.user.subscriptions.IPushSubscription;
3232
import com.onesignal.user.subscriptions.ISmsSubscription;
@@ -388,7 +388,7 @@ public void onScrollChanged() {
388388
private void setupAppLayout() {
389389
revokeConsentButton.setOnClickListener(v -> togglePrivacyConsent(false));
390390

391-
if(OneSignal.getUser().getAliases().containsKey("external_id")) {
391+
if(OneSignal.getUser().getExternalId() != null) {
392392
isLoggedIn = true;
393393
switchUserButton.setText(R.string.logout_user);
394394
}
@@ -546,7 +546,7 @@ public void onSuccess(Pair<String, Object> pair) {
546546
tagSet.remove(pair.first);
547547
toaster.makeCustomViewToast("Deleted tag " + pair.first, ToastType.SUCCESS);
548548
} else {
549-
OneSignal.getUser().setTag(pair.first, pair.second.toString());
549+
OneSignal.getUser().addTag(pair.first, pair.second.toString());
550550
tagSet.put(pair.first, pair.second);
551551
toaster.makeCustomViewToast("Added tag " + pair.first, ToastType.SUCCESS);
552552
}
@@ -625,7 +625,7 @@ private void setupSMSRecyclerView() {
625625
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
626626
smssRecyclerView.setLayoutManager(linearLayoutManager);
627627
smssRecyclerViewAdapter = new SingleRecyclerViewAdapter(context, smsArrayList, value -> {
628-
OneSignal.getUser().removeTrigger(value);
628+
OneSignal.getInAppMessages().removeTrigger(value);
629629
smsArrayList.remove(value);
630630
refreshSMSRecyclerView();
631631
toaster.makeCustomViewToast("Deleted SMS " + value, ToastType.SUCCESS);
@@ -651,18 +651,18 @@ private void setupOutcomeLayout() {
651651
public boolean onSuccess(OutcomeEvent outcomeEvent, String name, String value) {
652652
switch (outcomeEvent) {
653653
case OUTCOME:
654-
OneSignal.getSession().sendOutcome(name);
654+
OneSignal.getSession().addOutcome(name);
655655
break;
656656
case UNIQUE_OUTCOME:
657-
OneSignal.getSession().sendUniqueOutcome(name);
657+
OneSignal.getSession().addUniqueOutcome(name);
658658
break;
659659
case OUTCOME_WITH_VALUE:
660660
if (value.isEmpty()) {
661661
toaster.makeCustomViewToast("Please enter an outcome value!", ToastType.ERROR);
662662
return false;
663663
}
664664

665-
OneSignal.getSession().sendOutcomeWithValue(name, Float.parseFloat(value));
665+
OneSignal.getSession().addOutcomeWithValue(name, Float.parseFloat(value));
666666
break;
667667
}
668668

@@ -684,11 +684,11 @@ private void setupTriggersLayout() {
684684
@Override
685685
public void onSuccess(Pair<String, Object> pair) {
686686
if (pair.second == null || pair.second.toString().isEmpty()) {
687-
OneSignal.getUser().removeTrigger(pair.first);
687+
OneSignal.getInAppMessages().removeTrigger(pair.first);
688688
triggerSet.remove(pair.first);
689689
toaster.makeCustomViewToast("Deleted trigger " + pair.first, ToastType.SUCCESS);
690690
} else {
691-
OneSignal.getUser().setTrigger(pair.first, pair.second);
691+
OneSignal.getInAppMessages().addTrigger(pair.first, pair.second);
692692
triggerSet.put(pair.first, pair.second);
693693
toaster.makeCustomViewToast("Added trigger " + pair.first, ToastType.SUCCESS);
694694
}
@@ -708,7 +708,7 @@ private void setupTriggerRecyclerView() {
708708
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
709709
triggersRecyclerView.setLayoutManager(linearLayoutManager);
710710
triggerPairRecyclerViewAdapter = new PairRecyclerViewAdapter(context, triggerArrayList, key -> {
711-
OneSignal.getUser().removeTrigger(key);
711+
OneSignal.getInAppMessages().removeTrigger(key);
712712
triggerSet.remove(key);
713713

714714
refreshTriggerRecyclerView();
@@ -823,7 +823,7 @@ private void setupPauseInAppMessagesSwitch() {
823823

824824
pauseInAppMessagesSwitch.setChecked(SharedPreferenceUtil.getCachedInAppMessagingPausedStatus(context));
825825
pauseInAppMessagesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
826-
OneSignal.getIam().setPaused(isChecked);
826+
OneSignal.getInAppMessages().setPaused(isChecked);
827827
SharedPreferenceUtil.cacheInAppMessagingPausedStatus(context, isChecked);
828828
});
829829
}

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import androidx.appcompat.app.AppCompatActivity;
1010

1111
import com.onesignal.OneSignal;
12-
import com.onesignal.notification.IPermissionStateChanges;
12+
import com.onesignal.notifications.IPermissionStateChanges;
1313
import com.onesignal.sdktest.constant.Tag;
1414
import com.onesignal.sdktest.constant.Text;
1515
import com.onesignal.sdktest.util.IntentTo;
@@ -70,7 +70,7 @@ private void setupOneSignalSDK() {
7070
OneSignal.getLocation().setLocationShared(isLocationShared);
7171

7272
boolean isInAppMessagingPaused = SharedPreferenceUtil.getCachedInAppMessagingPausedStatus(context);
73-
OneSignal.getIam().setPaused(isInAppMessagingPaused);
73+
OneSignal.getInAppMessages().setPaused(isInAppMessagingPaused);
7474

7575
Log.d(Tag.DEBUG, Text.PRIVACY_CONSENT_REQUIRED_SET + ": " + privacyConsent);
7676

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/notification/NotificationServiceExtension.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import com.onesignal.debug.LogLevel;
66
import com.onesignal.debug.internal.logging.Logging;
7-
import com.onesignal.notification.IActionButton;
8-
import com.onesignal.notification.IMutableNotification;
9-
import com.onesignal.notification.INotification;
10-
import com.onesignal.notification.INotificationReceivedEvent;
11-
import com.onesignal.notification.IRemoteNotificationReceivedHandler;
7+
import com.onesignal.notifications.IActionButton;
8+
import com.onesignal.notifications.IMutableNotification;
9+
import com.onesignal.notifications.INotification;
10+
import com.onesignal.notifications.INotificationReceivedEvent;
11+
import com.onesignal.notifications.IRemoteNotificationReceivedHandler;
1212
import com.onesignal.sdktest.R;
1313

1414
public class NotificationServiceExtension implements IRemoteNotificationReceivedHandler {

‎OneSignalSDK/onesignal/iam/src/main/java/com/onesignal/iam/IAMModule.kt

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎OneSignalSDK/onesignal/iam/src/main/java/com/onesignal/iam/internal/DummyIAMManager.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎OneSignalSDK/onesignal/iam/src/test/java/com/onesignal/iam/ExampleUnitTest.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎OneSignalSDK/onesignal/iam/.gitignore renamed to ‎OneSignalSDK/onesignal/inAppMessages/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)