From d63c3fd2d23c9fb6b6cccb5fc2331b3637c52c6f Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Tue, 28 Nov 2023 17:33:00 -0500 Subject: [PATCH] Fix linting issues --- .../EnumSelectionRecyclerViewAdapter.java | 14 +++---- .../InAppMessageRecyclerViewAdapter.java | 18 ++++----- .../NotificationRecyclerViewAdapter.java | 16 ++++---- .../adapter/PairRecyclerViewAdapter.java | 14 +++---- .../adapter/SingleRecyclerViewAdapter.java | 12 +++--- .../SubscriptionRecyclerViewAdapter.java | 16 ++++---- .../sdktest/model/MainActivityViewModel.java | 40 +++++-------------- .../model/SplashActivityViewModel.java | 2 +- .../com/onesignal/sdktest/type/ToastType.java | 4 +- .../sdktest/ui/CustomAlertDialogBuilder.java | 7 ++-- .../sdktest/ui/RecyclerViewBuilder.java | 2 +- .../com/onesignal/sdktest/util/Dialog.java | 10 ++--- .../com/onesignal/sdktest/util/IntentTo.java | 2 +- .../com/onesignal/sdktest/util/Toaster.java | 4 +- .../common/events/CallbackProducer.kt | 2 +- .../com/onesignal/common/modeling/Model.kt | 2 +- .../common/services/ServiceProvider.kt | 2 +- .../application/impl/ApplicationService.kt | 2 +- .../background/impl/BackgroundManager.kt | 4 +- .../onesignal/debug/internal/DebugManager.kt | 2 +- .../com/onesignal/user/IUserStateObserver.kt | 1 - .../com/onesignal/user/UserChangedState.kt | 10 ++--- .../main/java/com/onesignal/user/UserState.kt | 2 +- .../user/internal/PushSubscription.kt | 2 +- .../onesignal/user/internal/UserManager.kt | 28 +++++++++---- .../executors/LoginUserOperationExecutor.kt | 2 +- .../subscriptions/SubscriptionModel.kt | 2 +- .../com/onesignal/mocks/DatabaseMockHelper.kt | 2 +- .../outcomes/OutcomeEventsControllerTests.kt | 4 +- .../subscriptions/SubscriptionManagerTests.kt | 6 +-- .../internal/InAppMessagesManager.kt | 2 +- .../internal/common/OneSignalChromeTab.kt | 2 +- .../internal/display/impl/InAppMessageView.kt | 10 ++--- .../lifecycle/impl/IAMLifecycleService.kt | 2 +- .../prompt/impl/InAppMessagePrompt.kt | 2 +- .../prompt/impl/InAppMessagePushPrompt.kt | 2 +- .../backend/InAppBackendServiceTests.kt | 24 +++++------ .../inAppMessages/mocks/DatabaseMockHelper.kt | 2 +- .../location/mocks/DatabaseMockHelper.kt | 2 +- .../location/shadows/ShadowGoogleApiClient.kt | 2 +- .../notifications/internal/Notification.kt | 2 +- .../shortcutbadger/impl/AdwHomeBadger.java | 2 +- .../shortcutbadger/impl/ApexHomeBadger.java | 5 ++- .../shortcutbadger/impl/AsusHomeBadger.java | 5 ++- .../shortcutbadger/impl/DefaultBadger.java | 2 +- .../impl/EverythingMeHomeBadger.java | 3 +- .../shortcutbadger/impl/HuaweiHomeBadger.java | 3 +- .../shortcutbadger/impl/LGHomeBadger.java | 2 +- .../shortcutbadger/impl/NewHtcHomeBadger.java | 5 ++- .../shortcutbadger/impl/NovaHomeBadger.java | 3 +- .../shortcutbadger/impl/VivoHomeBadger.java | 3 +- .../shortcutbadger/util/BroadcastHelper.java | 2 +- .../impl/NotificationBundleProcessor.kt | 2 +- .../impl/NotificationChannelManager.kt | 4 +- .../common/NotificationGenerationJob.kt | 10 ++--- .../internal/common/NotificationHelper.kt | 2 +- .../data/impl/NotificationRepository.kt | 2 +- .../impl/NotificationDisplayBuilder.kt | 16 ++++---- .../display/impl/NotificationDisplayer.kt | 16 ++++---- .../impl/SummaryNotificationDisplayer.kt | 28 ++++++------- .../impl/NotificationGenerationWorkManager.kt | 2 +- .../listeners/NotificationListener.kt | 2 +- ...vigateToAndroidSettingsForNotifications.kt | 6 +-- .../registration/impl/PushRegistratorADM.kt | 2 +- .../registration/impl/PushRegistratorNone.kt | 2 +- .../impl/NotificationRestoreWorkManager.kt | 2 +- .../notifications/mocks/DatabaseMockHelper.kt | 2 +- 67 files changed, 208 insertions(+), 211 deletions(-) diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/EnumSelectionRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/EnumSelectionRecyclerViewAdapter.java index 4331ba050b..4831c3f706 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/EnumSelectionRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/EnumSelectionRecyclerViewAdapter.java @@ -16,12 +16,12 @@ public class EnumSelectionRecyclerViewAdapter extends RecyclerView.Adapter { - private Font font; - private LayoutInflater layoutInflater; + private final Font font; + private final LayoutInflater layoutInflater; - private Context context; - private Object[] enums; - private EnumSelectionCallback callback; + private final Context context; + private final Object[] enums; + private final EnumSelectionCallback callback; public EnumSelectionRecyclerViewAdapter(Context context, Object[] enums, EnumSelectionCallback callback) { @@ -60,8 +60,8 @@ public int getItemCount() { public class EnumSelectionViewHolder extends RecyclerView.ViewHolder { - private RelativeLayout enumRelativeLayout; - private TextView enumTextView; + private final RelativeLayout enumRelativeLayout; + private final TextView enumTextView; private String title; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/InAppMessageRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/InAppMessageRecyclerViewAdapter.java index fe6884c1c2..1167e10f8b 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/InAppMessageRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/InAppMessageRecyclerViewAdapter.java @@ -23,12 +23,12 @@ public class InAppMessageRecyclerViewAdapter extends RecyclerView.Adapter { - private Animate animate; - private LayoutInflater layoutInflater; - private Toaster toaster; + private final Animate animate; + private final LayoutInflater layoutInflater; + private final Toaster toaster; - private Context context; - private InAppMessage[] inAppMessages; + private final Context context; + private final InAppMessage[] inAppMessages; public InAppMessageRecyclerViewAdapter(Context context, InAppMessage[] inAppMessages) { @@ -67,10 +67,10 @@ public int getItemCount() { public class InAppMessageViewHolder extends RecyclerView.ViewHolder { - private LinearLayout inAppMessageLinearLayout; - private ImageView inAppMessageImageView; - private ProgressBar inAppMessageProgressBar; - private TextView inAppMessageTextView; + private final LinearLayout inAppMessageLinearLayout; + private final ImageView inAppMessageImageView; + private final ProgressBar inAppMessageProgressBar; + private final TextView inAppMessageTextView; private InAppMessage inAppMessage; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/NotificationRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/NotificationRecyclerViewAdapter.java index b4cb9050f3..48344013dc 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/NotificationRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/NotificationRecyclerViewAdapter.java @@ -23,11 +23,11 @@ public class NotificationRecyclerViewAdapter extends RecyclerView.Adapter { - private Animate animate; - private LayoutInflater layoutInflater; + private final Animate animate; + private final LayoutInflater layoutInflater; - private Context context; - private Notification[] notifications; + private final Context context; + private final Notification[] notifications; public NotificationRecyclerViewAdapter(Context context, Notification[] notifications) { @@ -65,10 +65,10 @@ public int getItemCount() { public class NotificationViewHolder extends RecyclerView.ViewHolder { - private LinearLayout notificationLinearLayout; - private ImageView notificationImageView; - private ProgressBar notificationProgressBar; - private TextView notificationTextView; + private final LinearLayout notificationLinearLayout; + private final ImageView notificationImageView; + private final ProgressBar notificationProgressBar; + private final TextView notificationTextView; private Notification notification; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/PairRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/PairRecyclerViewAdapter.java index 6315ba5b0d..e00bfd9bc9 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/PairRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/PairRecyclerViewAdapter.java @@ -18,12 +18,12 @@ public class PairRecyclerViewAdapter extends RecyclerView.Adapter { - private LayoutInflater layoutInflater; + private final LayoutInflater layoutInflater; - private Context context; + private final Context context; - private ArrayList tags; - private PairItemActionCallback callback; + private final ArrayList tags; + private final PairItemActionCallback callback; public PairRecyclerViewAdapter(Context context, ArrayList tags, PairItemActionCallback callback) { this.context = context; @@ -54,9 +54,9 @@ public int getItemCount() { public class PairViewHolder extends RecyclerView.ViewHolder { - private RelativeLayout pairRelativeLayout; - private TextView pairKeyTextView; - private TextView pairValueTextView; + private final RelativeLayout pairRelativeLayout; + private final TextView pairKeyTextView; + private final TextView pairValueTextView; private Map.Entry pair; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SingleRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SingleRecyclerViewAdapter.java index 7cae936707..21facc5f3c 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SingleRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SingleRecyclerViewAdapter.java @@ -18,12 +18,12 @@ public class SingleRecyclerViewAdapter extends RecyclerView.Adapter { - private LayoutInflater layoutInflater; + private final LayoutInflater layoutInflater; - private Context context; + private final Context context; - private ArrayList values; - private SingleItemActionCallback callback; + private final ArrayList values; + private final SingleItemActionCallback callback; public SingleRecyclerViewAdapter(Context context, ArrayList values, SingleItemActionCallback callback) { this.context = context; @@ -54,8 +54,8 @@ public int getItemCount() { public class SingleViewHolder extends RecyclerView.ViewHolder { - private RelativeLayout singleRelativeLayout; - private TextView singleTextView; + private final RelativeLayout singleRelativeLayout; + private final TextView singleTextView; private Object item; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SubscriptionRecyclerViewAdapter.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SubscriptionRecyclerViewAdapter.java index c7a49f2645..5937ee2eb9 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SubscriptionRecyclerViewAdapter.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SubscriptionRecyclerViewAdapter.java @@ -21,12 +21,12 @@ public class SubscriptionRecyclerViewAdapter extends RecyclerView.Adapter { - private LayoutInflater layoutInflater; + private final LayoutInflater layoutInflater; - private Context context; + private final Context context; - private ArrayList subscriptions; - private SubscriptionItemActionCallback callback; + private final ArrayList subscriptions; + private final SubscriptionItemActionCallback callback; public SubscriptionRecyclerViewAdapter(Context context, ArrayList subscriptions, SubscriptionItemActionCallback callback) { this.context = context; @@ -57,10 +57,10 @@ public int getItemCount() { public class SubscriptionViewHolder extends RecyclerView.ViewHolder { - private LinearLayout singleLinearLayout; - private TextView idTextView; - private TextView addressTitleTextView; - private TextView addressTextView; + private final LinearLayout singleLinearLayout; + private final TextView idTextView; + private final TextView addressTitleTextView; + private final TextView addressTextView; private ISubscription item; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java index 6aa6e10d21..3b59160de9 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java @@ -490,11 +490,7 @@ public void run() { aliasArrayList.clear(); aliasArrayList.addAll(aliasSet.entrySet()); - if (aliasArrayList.size() > 0) { - animate.toggleAnimationView(false, View.GONE, aliasesRecyclerView, noAliasesTextView); - } else { - animate.toggleAnimationView(true, View.GONE, aliasesRecyclerView, noAliasesTextView); - } + animate.toggleAnimationView(aliasArrayList.size() <= 0, View.GONE, aliasesRecyclerView, noAliasesTextView); aliasesRecyclerViewAdapter.notifyDataSetChanged(); } @@ -510,16 +506,16 @@ public void onPushSubscriptionChange(@NonNull PushSubscriptionChangedState state public void onUserStateChange(@NonNull UserChangedState state) { UserState currentState = state.getCurrent(); UserState prevState = state.getPrevious(); - Logging.debug("onUserStateChanged; previous onesignalId: " + String.valueOf(prevState.getOnesignalId()) - + ", previous externalId: " + String.valueOf(prevState.getExternalId()) - + ", current onesignalId: " + String.valueOf(currentState.getOnesignalId()) - + ", current externalId: " + String.valueOf(currentState.getExternalId()), + Logging.debug("onUserStateChanged; previous onesignalId: " + prevState.getOnesignalId() + + ", previous externalId: " + prevState.getExternalId() + + ", current onesignalId: " + currentState.getOnesignalId() + + ", current externalId: " + currentState.getExternalId(), null); } private class DummySubscription implements ISubscription { - private String _id; + private final String _id; public DummySubscription(String id) { _id = id; } @@ -626,11 +622,7 @@ public void run() { tagArrayList.clear(); tagArrayList.addAll(tagSet.entrySet()); - if (tagArrayList.size() > 0) { - animate.toggleAnimationView(false, View.GONE, tagsRecyclerView, noTagsTextView); - } else { - animate.toggleAnimationView(true, View.GONE, tagsRecyclerView, noTagsTextView); - } + animate.toggleAnimationView(tagArrayList.size() <= 0, View.GONE, tagsRecyclerView, noTagsTextView); tagPairRecyclerViewAdapter.notifyDataSetChanged(); } @@ -653,11 +645,7 @@ private void setupEmailRecyclerView() { private void refreshEmailRecyclerView() { getActivity().runOnUiThread(() -> { - if (emailArrayList.size() > 0) { - animate.toggleAnimationView(false, View.GONE, emailsRecyclerView, noEmailsTextView); - } else { - animate.toggleAnimationView(true, View.GONE, emailsRecyclerView, noEmailsTextView); - } + animate.toggleAnimationView(emailArrayList.size() <= 0, View.GONE, emailsRecyclerView, noEmailsTextView); emailsRecyclerViewAdapter.notifyDataSetChanged(); }); @@ -679,11 +667,7 @@ private void setupSMSRecyclerView() { private void refreshSMSRecyclerView() { getActivity().runOnUiThread(() -> { - if (smsArrayList.size() > 0) { - animate.toggleAnimationView(false, View.GONE, smssRecyclerView, noSmssTextView); - } else { - animate.toggleAnimationView(true, View.GONE, smssRecyclerView, noSmssTextView); - } + animate.toggleAnimationView(smsArrayList.size() <= 0, View.GONE, smssRecyclerView, noSmssTextView); smssRecyclerViewAdapter.notifyDataSetChanged(); }); @@ -769,11 +753,7 @@ public void run() { triggerArrayList.clear(); triggerArrayList.addAll(triggerSet.entrySet()); - if (triggerArrayList.size() > 0) { - animate.toggleAnimationView(false, View.GONE, triggersRecyclerView, noTriggersTextView); - } else { - animate.toggleAnimationView(true, View.GONE, triggersRecyclerView, noTriggersTextView); - } + animate.toggleAnimationView(triggerArrayList.size() <= 0, View.GONE, triggersRecyclerView, noTriggersTextView); triggerPairRecyclerViewAdapter.notifyDataSetChanged(); } diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java index c3116b9058..f7b4198fc0 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java @@ -20,7 +20,7 @@ public class SplashActivityViewModel implements ActivityViewModel { private Context context; - private boolean[] tasks = {false, false, false}; + private final boolean[] tasks = {false, false, false}; @Override public Activity getActivity() { diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/type/ToastType.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/type/ToastType.java index 3da88ad419..043d993592 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/type/ToastType.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/type/ToastType.java @@ -9,8 +9,8 @@ public enum ToastType { WARNING(R.drawable.ic_alert_white_48dp, R.color.colorToastWarning), ERROR(R.drawable.ic_alert_octagon_white_48dp, R.color.colorToastError); - private int icon; - private int color; + private final int icon; + private final int color; ToastType(int icon, int color) { this.icon = icon; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/CustomAlertDialogBuilder.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/CustomAlertDialogBuilder.java index 3350c70356..eb082b4632 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/CustomAlertDialogBuilder.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/CustomAlertDialogBuilder.java @@ -33,7 +33,7 @@ public class CustomAlertDialogBuilder extends AlertDialog.Builder { private Button positiveButton; private Button negativeButton; - private View view; + private final View view; private Boolean mCancelOnTouchOutside = null; private boolean isCancelable = true; @@ -115,9 +115,8 @@ public AlertDialog show() { alertDialogBuilder.setOnKeyListener(new DialogInterface.OnKeyListener() { @Override public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { - switch (keyCode) { - case KeyEvent.KEYCODE_BACK: - return !isCancelable; + if (keyCode == KeyEvent.KEYCODE_BACK) { + return !isCancelable; } return false; } diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/RecyclerViewBuilder.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/RecyclerViewBuilder.java index 236f940386..70ebdff739 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/RecyclerViewBuilder.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/ui/RecyclerViewBuilder.java @@ -9,7 +9,7 @@ public class RecyclerViewBuilder { - private Context context; + private final Context context; public RecyclerViewBuilder(Context context) { diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java index 797d06372e..8644e30330 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java @@ -31,12 +31,12 @@ public class Dialog { - private Font font; - private LayoutInflater layoutInflater; - private RecyclerViewBuilder recyclerViewBuilder; - private Toaster toaster; + private final Font font; + private final LayoutInflater layoutInflater; + private final RecyclerViewBuilder recyclerViewBuilder; + private final Toaster toaster; - private Context context; + private final Context context; public Dialog(Context context) { this.context = context; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/IntentTo.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/IntentTo.java index d99f53b339..0f21fd645b 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/IntentTo.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/IntentTo.java @@ -13,7 +13,7 @@ public class IntentTo { - private Context context; + private final Context context; public IntentTo(Context context) { this.context = context; diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Toaster.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Toaster.java index d41aafd1be..0981ed19a6 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Toaster.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Toaster.java @@ -16,8 +16,8 @@ public class Toaster { - private Context context; - private Font font; + private final Context context; + private final Font font; public Toaster(Context context) { this.context = context; diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt index 79dea48a3c..c7a9f1af98 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt @@ -8,7 +8,7 @@ import kotlinx.coroutines.withContext * A standard implementation that implements [ICallbackNotifier] and additional functionality to * make callbacks less burdensome to the user. */ -open class CallbackProducer() : ICallbackNotifier { +open class CallbackProducer : ICallbackNotifier { private var callback: THandler? = null override val hasCallback: Boolean diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt index fe7cbaac77..af425866cd 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt @@ -641,7 +641,7 @@ open class Model( data[name] } else { val defaultValue = create() - data[name] = defaultValue as Any? + data[name] = defaultValue defaultValue } } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt index c2630baa39..12b2ccd09e 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt @@ -51,7 +51,7 @@ class ServiceProvider( val listOfServices: MutableList = mutableListOf() if (serviceMap.containsKey(c)) { - for (serviceReg in serviceMap!![c]!!) { + for (serviceReg in serviceMap[c]!!) { val service = serviceReg.resolve(this) as T? ?: throw Exception("Could not instantiate service: $serviceReg") diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt index c1a7f5f45f..fde442b200 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt @@ -25,7 +25,7 @@ import com.onesignal.core.internal.application.IApplicationService import com.onesignal.debug.internal.logging.Logging import java.lang.ref.WeakReference -class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, OnGlobalLayoutListener { +class ApplicationService : IApplicationService, ActivityLifecycleCallbacks, OnGlobalLayoutListener { private val activityLifecycleNotifier = EventProducer() private val applicationLifecycleNotifier = EventProducer() private val systemConditionNotifier = EventProducer() diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt index 4cc37d3132..bb9b73dad6 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt @@ -189,12 +189,12 @@ internal class BackgroundManager( needsJobReschedule = true return } - val jobBuilder = JobInfo.Builder(SYNC_TASK_ID, ComponentName(_applicationService.appContext!!, syncServiceJobClass!!)) + val jobBuilder = JobInfo.Builder(SYNC_TASK_ID, ComponentName(_applicationService.appContext, syncServiceJobClass)) jobBuilder .setMinimumLatency(delayMs) .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) if (hasBootPermission()) jobBuilder.setPersisted(true) - val jobScheduler = _applicationService.appContext!!.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler + val jobScheduler = _applicationService.appContext.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler try { val result = jobScheduler.schedule(jobBuilder.build()) Logging.info("OSBackgroundSync scheduleSyncServiceAsJob:result: $result") diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt index 1067f0f7dc..6b7268dcc6 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt @@ -4,7 +4,7 @@ import com.onesignal.debug.IDebugManager import com.onesignal.debug.LogLevel import com.onesignal.debug.internal.logging.Logging -internal class DebugManager() : IDebugManager { +internal class DebugManager : IDebugManager { override var logLevel: LogLevel get() = Logging.logLevel set(value) { diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt index a10a673e3c..7a0f9f3e82 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt @@ -1,6 +1,5 @@ package com.onesignal.user - /** * A user state changed handler. Implement this interface and provide the implementation * to be notified when the user has changed. diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt index 1789173b1b..b6d74391cb 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt @@ -3,12 +3,12 @@ package com.onesignal.user import org.json.JSONObject class UserChangedState( - val previous: UserState, - val current: UserState, + val previous: UserState, + val current: UserState, ) { fun toJSONObject(): JSONObject { return JSONObject() - .put("previous", previous.toJSONObject()) - .put("current", current.toJSONObject()) + .put("previous", previous.toJSONObject()) + .put("current", current.toJSONObject()) } -} \ No newline at end of file +} diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt index 749243cd44..d3fe15a5a0 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt @@ -25,4 +25,4 @@ class UserState( .put("onesignalId", onesignalId) .put("externalId", externalId) } -} \ No newline at end of file +} diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt index 3e5dac63f4..47c407284f 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt @@ -45,7 +45,7 @@ internal open class PushSubscription( } } -internal class UninitializedPushSubscription() : PushSubscription(createFakePushSub()) { +internal class UninitializedPushSubscription : PushSubscription(createFakePushSub()) { companion object { fun createFakePushSub(): SubscriptionModel { val pushSubModel = SubscriptionModel() diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt index 1fcd18bde1..07a827dd60 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt @@ -9,14 +9,14 @@ import com.onesignal.core.internal.language.ILanguageContext import com.onesignal.debug.LogLevel import com.onesignal.debug.internal.logging.Logging import com.onesignal.user.IUserManager +import com.onesignal.user.IUserStateObserver +import com.onesignal.user.UserChangedState +import com.onesignal.user.UserState import com.onesignal.user.internal.backend.IdentityConstants import com.onesignal.user.internal.identity.IdentityModel import com.onesignal.user.internal.identity.IdentityModelStore import com.onesignal.user.internal.properties.PropertiesModel import com.onesignal.user.internal.properties.PropertiesModelStore -import com.onesignal.user.IUserStateObserver -import com.onesignal.user.UserChangedState -import com.onesignal.user.UserState import com.onesignal.user.internal.subscriptions.ISubscriptionManager import com.onesignal.user.internal.subscriptions.SubscriptionList import com.onesignal.user.subscriptions.IPushSubscription @@ -241,19 +241,33 @@ internal open class UserManager( changeHandlersNotifier.unsubscribe(observer) } - override fun onModelReplaced(model: ModelReplacedArgs, tag: String) { + override fun onModelReplaced( + model: ModelReplacedArgs, + tag: String, + ) { val oldUserState = UserState(model.oldModel.onesignalId, model.oldModel.externalId) val newUserState = UserState(model.newModel.onesignalId, model.newModel.externalId) - if (oldUserState.onesignalId.equals(newUserState.onesignalId) && oldUserState.externalId.equals(newUserState.externalId)) + if (oldUserState.onesignalId.equals(newUserState.onesignalId) && + oldUserState.externalId.equals(newUserState.externalId) + ) { return + } this.changeHandlersNotifier.fire { - it.onUserStateChange(UserChangedState(oldUserState, newUserState)) + it.onUserStateChange( + UserChangedState( + oldUserState, + newUserState, + ), + ) } } - override fun onModelUpdated(args: ModelChangedArgs, tag: String) { + override fun onModelUpdated( + args: ModelChangedArgs, + tag: String, + ) { Logging.debug(args.property) } } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt index 159ffa2a3f..e63490309e 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt @@ -137,7 +137,7 @@ internal class LoginUserOperationExecutor( var identities = mapOf() var subscriptions = mapOf() val properties = mutableMapOf() - properties["timezone_id"] = TimeUtils.getTimeZoneId()!! + properties["timezone_id"] = TimeUtils.getTimeZoneId() properties["language"] = _languageContext.language if (createUserOperation.externalId != null) { diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt index f8ff8b206a..fe572bc940 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt @@ -2,7 +2,7 @@ package com.onesignal.user.internal.subscriptions import com.onesignal.common.modeling.Model -enum class SubscriptionType() { +enum class SubscriptionType { EMAIL, SMS, PUSH, diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt index 4a71a6474b..594e299bce 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt @@ -18,7 +18,7 @@ internal object DatabaseMockHelper { val mockOneSignalDatabase = spyk() if (records != null) { - val mockCursor = cursor(records!!) + val mockCursor = cursor(records) every { mockOneSignalDatabase.query(tableName, any(), any(), any(), any(), any(), any(), any(), any()) } answers { diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt index 0242cfa3f5..c210dd287d 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt @@ -628,7 +628,7 @@ class OutcomeEventsControllerTests : FunSpec({ it.weight shouldBe .2f it.timestamp shouldBe 2222 it.notificationIds!!.getString(0) shouldBe "notificationId2" - it.notificationIds!!.getString(1) shouldBe "notificationId3" + it.notificationIds.getString(1) shouldBe "notificationId3" }, ) } @@ -720,7 +720,7 @@ class OutcomeEventsControllerTests : FunSpec({ it.weight shouldBe .2f it.timestamp shouldBe 2222 it.notificationIds!!.getString(0) shouldBe "notificationId2" - it.notificationIds!!.getString(1) shouldBe "notificationId3" + it.notificationIds.getString(1) shouldBe "notificationId3" }, ) } diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt index 897c3ee4ea..8cb4ab9f91 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt @@ -57,9 +57,9 @@ class SubscriptionManagerTests : FunSpec({ // Then subscriptions.collection.count() shouldBe 3 subscriptions.push shouldNotBe null - subscriptions.push!!.id shouldBe pushSubscription.id - subscriptions.push!!.token shouldBe pushSubscription.address - subscriptions.push!!.optedIn shouldBe pushSubscription.optedIn + subscriptions.push.id shouldBe pushSubscription.id + subscriptions.push.token shouldBe pushSubscription.address + subscriptions.push.optedIn shouldBe pushSubscription.optedIn subscriptions.emails.count() shouldBe 1 subscriptions.emails[0].id shouldBe emailSubscription.id subscriptions.emails[0].email shouldBe emailSubscription.address diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt index fe1e299457..82adf27090 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt @@ -707,7 +707,7 @@ internal class InAppMessagesManager( } if (tags?.tagsToRemove != null) { - val tagKeys = JSONUtils.newStringSetFromJSONArray(tags?.tagsToRemove!!) + val tagKeys = JSONUtils.newStringSetFromJSONArray(tags.tagsToRemove!!) _userManager.removeTags(tagKeys) } } diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt index c29476ce02..32185245bb 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt @@ -60,7 +60,7 @@ internal object OneSignalChromeTab { ) } - private class OneSignalCustomTabsServiceConnection internal constructor( + private class OneSignalCustomTabsServiceConnection( private val url: String, private val openActivity: Boolean, private val context: Context, diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt index abf94008b2..0f06f3b73f 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt @@ -321,9 +321,7 @@ internal class InAppMessageView( ) { draggableRelativeLayout = DraggableRelativeLayout(context) if (relativeLayoutParams != null) { - draggableRelativeLayout!!.setLayoutParams( - relativeLayoutParams, - ) + draggableRelativeLayout!!.layoutParams = relativeLayoutParams } draggableRelativeLayout!!.setParams(draggableParams) draggableRelativeLayout!!.setListener( @@ -357,8 +355,8 @@ internal class InAppMessageView( marginPxSizeRight, marginPxSizeBottom, ) - draggableRelativeLayout!!.setClipChildren(false) - draggableRelativeLayout!!.setClipToPadding(false) + draggableRelativeLayout!!.clipChildren = false + draggableRelativeLayout!!.clipToPadding = false draggableRelativeLayout!!.addView(cardView) } @@ -505,7 +503,7 @@ internal class InAppMessageView( backgroundView: View, ) { val messageViewCardView = - messageView!!.findViewWithTag( + messageView.findViewWithTag( IN_APP_MESSAGE_CARD_VIEW_TAG, ) val cardViewAnimCallback = createAnimationListener(messageViewCardView) diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt index 95602a3d42..2862c5044d 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt @@ -7,7 +7,7 @@ import com.onesignal.inAppMessages.internal.InAppMessagePage import com.onesignal.inAppMessages.internal.lifecycle.IInAppLifecycleEventHandler import com.onesignal.inAppMessages.internal.lifecycle.IInAppLifecycleService -internal class IAMLifecycleService() : +internal class IAMLifecycleService : EventProducer(), IInAppLifecycleService { override fun messageWillDisplay(message: InAppMessage) { diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt index 405d821476..631efe37ab 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt @@ -1,6 +1,6 @@ package com.onesignal.inAppMessages.internal.prompt.impl -internal abstract class InAppMessagePrompt() { +internal abstract class InAppMessagePrompt { private var prompted = false abstract suspend fun handlePrompt(): PromptActionResult? diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt index bb2d36d507..14fe9db040 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt @@ -6,7 +6,7 @@ import com.onesignal.notifications.INotificationsManager internal class InAppMessagePushPrompt( private val _notificationsManager: INotificationsManager, ) : InAppMessagePrompt() { - override suspend fun handlePrompt(): PromptActionResult? { + override suspend fun handlePrompt(): PromptActionResult { val result = _notificationsManager.requestPermission(true) return if (result) PromptActionResult.PERMISSION_GRANTED else PromptActionResult.PERMISSION_DENIED diff --git a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt index 024922f06f..0a02fb6d88 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt @@ -116,10 +116,10 @@ class InAppBackendServiceTests : FunSpec({ response.shouldRetry shouldBe false response.content shouldNotBe null response.content!!.contentHtml shouldStartWith "html1" - response.content!!.displayDuration shouldBe 123 - response.content!!.useHeightMargin shouldBe false - response.content!!.useWidthMargin shouldBe false - response.content!!.isFullBleed shouldBe true + response.content.displayDuration shouldBe 123 + response.content.useHeightMargin shouldBe false + response.content.useWidthMargin shouldBe false + response.content.isFullBleed shouldBe true coVerify(exactly = 1) { mockHttpClient.get("in_app_messages/messageId/variants/variantId/html?app_id=appId", any()) } } @@ -159,10 +159,10 @@ class InAppBackendServiceTests : FunSpec({ response.shouldRetry shouldBe false response.content shouldNotBe null response.content!!.contentHtml shouldStartWith "html1" - response.content!!.displayDuration shouldBe 123 - response.content!!.useHeightMargin shouldBe true - response.content!!.useWidthMargin shouldBe true - response.content!!.isFullBleed shouldBe false + response.content.displayDuration shouldBe 123 + response.content.useHeightMargin shouldBe true + response.content.useWidthMargin shouldBe true + response.content.isFullBleed shouldBe false coVerify(exactly = 1) { mockHttpClient.get("in_app_messages/messageId/variants/variantId/html?app_id=appId", any()) } } @@ -252,10 +252,10 @@ class InAppBackendServiceTests : FunSpec({ // Then response shouldNotBe null response!!.contentHtml shouldStartWith "html1" - response!!.displayDuration shouldBe 123 - response!!.useHeightMargin shouldBe false - response!!.useWidthMargin shouldBe false - response!!.isFullBleed shouldBe true + response.displayDuration shouldBe 123 + response.useHeightMargin shouldBe false + response.useWidthMargin shouldBe false + response.isFullBleed shouldBe true coVerify(exactly = 1) { mockHttpClient.get("in_app_messages/device_preview?preview_id=previewUUID&app_id=appId", any()) } } diff --git a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt index b962ff6b25..f8e15f0c87 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt @@ -18,7 +18,7 @@ internal object DatabaseMockHelper { val mockOneSignalDatabase = spyk() if (records != null) { - val mockCursor = cursor(records!!) + val mockCursor = cursor(records) every { mockOneSignalDatabase.query(tableName, any(), any(), any(), any(), any(), any(), any(), any()) } answers { diff --git a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/mocks/DatabaseMockHelper.kt index 4a71a6474b..594e299bce 100644 --- a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/mocks/DatabaseMockHelper.kt +++ b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/mocks/DatabaseMockHelper.kt @@ -18,7 +18,7 @@ internal object DatabaseMockHelper { val mockOneSignalDatabase = spyk() if (records != null) { - val mockCursor = cursor(records!!) + val mockCursor = cursor(records) every { mockOneSignalDatabase.query(tableName, any(), any(), any(), any(), any(), any(), any(), any()) } answers { diff --git a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/shadows/ShadowGoogleApiClient.kt b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/shadows/ShadowGoogleApiClient.kt index a3ab00b90a..d93907b837 100644 --- a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/shadows/ShadowGoogleApiClient.kt +++ b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/shadows/ShadowGoogleApiClient.kt @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit @Implements(value = GoogleApiClient.Builder::class, looseSignatures = true) class ShadowGoogleApiClientBuilder { @Implementation - fun build(): GoogleApiClient? { + fun build(): GoogleApiClient { return ShadowGoogleApiClient() } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/Notification.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/Notification.kt index b8e41c1bff..1dc503bc8b 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/Notification.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/Notification.kt @@ -53,7 +53,7 @@ class Notification : IDisplayableMutableNotification { override var ttl = 0 override var rawPayload: String = "" - constructor(payload: JSONObject, time: ITime) : this(null, payload, 0, time) {} + constructor(payload: JSONObject, time: ITime) : this(null, payload, 0, time) constructor( groupedNotifications: List?, jsonPayload: JSONObject, diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AdwHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AdwHomeBadger.java index 4ec7c22808..1df426c2db 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AdwHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AdwHomeBadger.java @@ -32,7 +32,7 @@ public void executeBadge(Context context, ComponentName componentName, int badge if (BroadcastHelper.canResolveBroadcast(context, intent)) { context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/ApexHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/ApexHomeBadger.java index 9971700a7d..e6971c4d6d 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/ApexHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/ApexHomeBadger.java @@ -10,6 +10,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.util.BroadcastHelper; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -32,12 +33,12 @@ public void executeBadge(Context context, ComponentName componentName, int badge if (BroadcastHelper.canResolveBroadcast(context, intent)) { context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } @Override public List getSupportLaunchers() { - return Arrays.asList("com.anddoes.launcher"); + return Collections.singletonList("com.anddoes.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AsusHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AsusHomeBadger.java index 6de1d20848..e804fb5d96 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AsusHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/AsusHomeBadger.java @@ -10,6 +10,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.util.BroadcastHelper; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -32,12 +33,12 @@ public void executeBadge(Context context, ComponentName componentName, int badge if (BroadcastHelper.canResolveBroadcast(context, intent)) { context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } @Override public List getSupportLaunchers() { - return Arrays.asList("com.asus.launcher"); + return Collections.singletonList("com.asus.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/DefaultBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/DefaultBadger.java index b6451c38b7..33dbe5b177 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/DefaultBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/DefaultBadger.java @@ -30,7 +30,7 @@ public void executeBadge(Context context, ComponentName componentName, int badge if (BroadcastHelper.canResolveBroadcast(context, intent)) { context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/EverythingMeHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/EverythingMeHomeBadger.java index 6f54d85f66..2add62a889 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/EverythingMeHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/EverythingMeHomeBadger.java @@ -10,6 +10,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.ShortcutBadgeException; import java.util.Arrays; +import java.util.Collections; import java.util.List; @@ -35,6 +36,6 @@ public void executeBadge(Context context, ComponentName componentName, int badge @Override public List getSupportLaunchers() { - return Arrays.asList("me.everything.launcher"); + return Collections.singletonList("me.everything.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/HuaweiHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/HuaweiHomeBadger.java index c175006517..1ef4f90992 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/HuaweiHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/HuaweiHomeBadger.java @@ -11,6 +11,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.ShortcutBadgeException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -31,7 +32,7 @@ public void executeBadge(Context context, ComponentName componentName, int badge @Override public List getSupportLaunchers() { - return Arrays.asList( + return Collections.singletonList( "com.huawei.android.launcher" ); } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/LGHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/LGHomeBadger.java index dd1f9c8470..4841f680ba 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/LGHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/LGHomeBadger.java @@ -33,7 +33,7 @@ public void executeBadge(Context context, ComponentName componentName, int badge if(BroadcastHelper.canResolveBroadcast(context, intent)) { context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NewHtcHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NewHtcHomeBadger.java index 3915a3d29c..3ff34e94a7 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NewHtcHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NewHtcHomeBadger.java @@ -10,6 +10,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.util.BroadcastHelper; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -39,12 +40,12 @@ public void executeBadge(Context context, ComponentName componentName, int badge context.sendBroadcast(intent1); context.sendBroadcast(intent); } else { - throw new ShortcutBadgeException("unable to resolve intent: " + intent.toString()); + throw new ShortcutBadgeException("unable to resolve intent: " + intent); } } @Override public List getSupportLaunchers() { - return Arrays.asList("com.htc.launcher"); + return Collections.singletonList("com.htc.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NovaHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NovaHomeBadger.java index ec9f8b5d8f..756e4d137a 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NovaHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/NovaHomeBadger.java @@ -10,6 +10,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.ShortcutBadgeException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -35,6 +36,6 @@ public void executeBadge(Context context, ComponentName componentName, int badge @Override public List getSupportLaunchers() { - return Arrays.asList("com.teslacoilsw.launcher"); + return Collections.singletonList("com.teslacoilsw.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/VivoHomeBadger.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/VivoHomeBadger.java index 6ff8b6ede5..d573b1235a 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/VivoHomeBadger.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/impl/VivoHomeBadger.java @@ -9,6 +9,7 @@ import com.onesignal.notifications.internal.badges.impl.shortcutbadger.ShortcutBadgeException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -27,6 +28,6 @@ public void executeBadge(Context context, ComponentName componentName, int badge @Override public List getSupportLaunchers() { - return Arrays.asList("com.vivo.launcher"); + return Collections.singletonList("com.vivo.launcher"); } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/util/BroadcastHelper.java b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/util/BroadcastHelper.java index 9dd907924c..b4694197ae 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/util/BroadcastHelper.java +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/badges/impl/shortcutbadger/util/BroadcastHelper.java @@ -24,7 +24,7 @@ public static List resolveBroadcast(Context context, Intent intent) PackageManager packageManager = context.getPackageManager(); List receivers = packageManager.queryBroadcastReceivers(intent, 0); - return receivers != null ? receivers : Collections.emptyList(); + return receivers != null ? receivers : Collections.emptyList(); } public static void sendIntentExplicitly(Context context, Intent intent) throws ShortcutBadgeException { diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/bundle/impl/NotificationBundleProcessor.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/bundle/impl/NotificationBundleProcessor.kt index 9e95d4115e..32755712d2 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/bundle/impl/NotificationBundleProcessor.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/bundle/impl/NotificationBundleProcessor.kt @@ -70,7 +70,7 @@ internal class NotificationBundleProcessor( override fun processBundleFromReceiver( context: Context, bundle: Bundle, - ): INotificationBundleProcessor.ProcessedBundleResult? { + ): INotificationBundleProcessor.ProcessedBundleResult { val bundleResult = INotificationBundleProcessor.ProcessedBundleResult() // Not a OneSignal FCM message diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt index f5e9fe6e74..844fc31395 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt @@ -38,7 +38,7 @@ internal class NotificationChannelManager( override fun createNotificationChannel(notificationJob: NotificationGenerationJob): String { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return DEFAULT_CHANNEL_ID val context = _applicationService.appContext - val jsonPayload = notificationJob.jsonPayload!! + val jsonPayload = notificationJob.jsonPayload val notificationManager = NotificationHelper.getNotificationManager(context) if (notificationJob.isRestoring) return createRestoreChannel(notificationManager) @@ -80,7 +80,7 @@ internal class NotificationChannelManager( } else { objChannelPayload as JSONObject } - var channelId = channelPayload!!.optString("id", DEFAULT_CHANNEL_ID) + var channelId = channelPayload.optString("id", DEFAULT_CHANNEL_ID) // Ensure we don't try to use the system reserved id if (channelId == NotificationChannel.DEFAULT_CHANNEL_ID) channelId = DEFAULT_CHANNEL_ID var payloadWithText = channelPayload diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt index 71f3ccc1d2..42ee1d007d 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt @@ -39,29 +39,29 @@ class NotificationGenerationJob( * Get the notification title from the payload */ val title: CharSequence? - get() = overriddenTitleFromExtender ?: notification!!.title as CharSequence? + get() = overriddenTitleFromExtender ?: notification.title as CharSequence? /** * Get the notification body from the payload */ val body: CharSequence? - get() = overriddenBodyFromExtender ?: notification!!.body as CharSequence? + get() = overriddenBodyFromExtender ?: notification.body as CharSequence? /** * Get the notification additional data json from the payload */ val additionalData: JSONObject - get() = notification!!.additionalData ?: JSONObject() + get() = notification.additionalData ?: JSONObject() fun hasExtender(): Boolean { - return notification!!.notificationExtender != null + return notification.notificationExtender != null } val apiNotificationId: String get() = NotificationHelper.getNotificationIdFromFCMJson(jsonPayload) ?: "" val androidId: Int - get() = notification!!.androidNotificationId + get() = notification.androidNotificationId override fun toString(): String { return "NotificationGenerationJob{" + diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt index 742c08c261..da00b097bc 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt @@ -136,7 +136,7 @@ object NotificationHelper { // Channels were introduced in O if (channelId != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val channel = getNotificationManager(context)?.getNotificationChannel(channelId) + val channel = getNotificationManager(context).getNotificationChannel(channelId) return channel == null || channel.importance != NotificationManager.IMPORTANCE_NONE } } catch (t: Throwable) { diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt index b09bc4e157..ba754fec79 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt @@ -162,7 +162,7 @@ internal class NotificationRepository( withContext(Dispatchers.IO) { val retColumn = arrayOf(OneSignalDbContract.NotificationTable.COLUMN_NAME_NOTIFICATION_ID) - val whereArgs = arrayOf(id!!) + val whereArgs = arrayOf(id) _databaseProvider.os.query( OneSignalDbContract.NotificationTable.TABLE_NAME, columns = retColumn, diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt index 72d92bb8a1..b4c9599485 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt @@ -56,8 +56,8 @@ internal class NotificationDisplayBuilder( override fun getTitle(fcmJson: JSONObject): CharSequence { val title: CharSequence? = fcmJson.optString("title", null) return title - ?: currentContext!!.packageManager.getApplicationLabel( - currentContext!!.applicationInfo, + ?: currentContext.packageManager.getApplicationLabel( + currentContext.applicationInfo, ) } @@ -80,7 +80,7 @@ internal class NotificationDisplayBuilder( } override fun getBaseOneSignalNotificationBuilder(notificationJob: NotificationGenerationJob): OneSignalNotificationBuilder { - val fcmJson: JSONObject = notificationJob.jsonPayload!! + val fcmJson: JSONObject = notificationJob.jsonPayload val oneSignalNotificationBuilder = OneSignalNotificationBuilder() val notificationBuilder: NotificationCompat.Builder notificationBuilder = @@ -88,9 +88,9 @@ internal class NotificationDisplayBuilder( val channelId: String = _notificationChannelManager.createNotificationChannel(notificationJob) // Will throw if app is using 26.0.0-beta1 or older of the support library. - NotificationCompat.Builder(currentContext!!, channelId) + NotificationCompat.Builder(currentContext, channelId) } catch (t: Throwable) { - NotificationCompat.Builder(currentContext!!) + NotificationCompat.Builder(currentContext) } val message = fcmJson.optString("alert", null) notificationBuilder @@ -172,7 +172,7 @@ internal class NotificationDisplayBuilder( } } if (isSoundEnabled(fcmJson)) { - val soundUri: Uri? = NotificationHelper.getSoundUri(currentContext!!, fcmJson.optString("sound", null)) + val soundUri: Uri? = NotificationHelper.getSoundUri(currentContext, fcmJson.optString("sound", null)) if (soundUri != null) { notifBuilder.setSound(soundUri) } else { @@ -265,7 +265,7 @@ internal class NotificationDisplayBuilder( try { var bitmap: Bitmap? = null try { - bitmap = BitmapFactory.decodeStream(currentContext!!.assets.open(bitmapStr)) + bitmap = BitmapFactory.decodeStream(currentContext.assets.open(bitmapStr)) } catch (t: Throwable) { } if (bitmap != null) return bitmap @@ -273,7 +273,7 @@ internal class NotificationDisplayBuilder( for (extension in imageExtensions) { try { bitmap = - BitmapFactory.decodeStream(currentContext!!.assets.open(bitmapStr + extension)) + BitmapFactory.decodeStream(currentContext.assets.open(bitmapStr + extension)) } catch (t: Throwable) { } if (bitmap != null) return bitmap diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayer.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayer.kt index 5e6e8e4c91..a02d258756 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayer.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayer.kt @@ -74,7 +74,7 @@ internal class NotificationDisplayer( // Put the message into a notification and post it. private suspend fun showNotification(notificationJob: NotificationGenerationJob): Boolean { val notificationId: Int = notificationJob.androidId - val fcmJson: JSONObject = notificationJob.jsonPayload!! + val fcmJson: JSONObject = notificationJob.jsonPayload var group: String? = fcmJson.safeString("grp") val intentGenerator = IntentGeneratorForAttachingToNotifications(currentContext) var grouplessNotifs = ArrayList() @@ -165,11 +165,11 @@ internal class NotificationDisplayer( // created by Android itself. if (group == null || Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR1) { _notificationDisplayBuilder.addXiaomiSettings(oneSignalNotificationBuilder, notification) - NotificationManagerCompat.from(currentContext!!).notify(notificationId, notification) + NotificationManagerCompat.from(currentContext).notify(notificationId, notification) } return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationHelper.areNotificationsEnabled(currentContext!!, notification.channelId) + NotificationHelper.areNotificationsEnabled(currentContext, notification.channelId) } else { true } @@ -210,7 +210,7 @@ internal class NotificationDisplayer( var mNotification = mNotificationField[notificationBuilder] as Notification notificationJob.orgFlags = mNotification.flags notificationJob.orgSound = mNotification.sound - notificationBuilder!!.extend(notificationJob.notification!!.notificationExtender!!) + notificationBuilder!!.extend(notificationJob.notification.notificationExtender!!) mNotification = mNotificationField[notificationBuilder] as Notification val mContentTextField = NotificationCompat.Builder::class.java.getDeclaredField("mContentText") @@ -258,7 +258,7 @@ internal class NotificationDisplayer( } if (bgImage != null) { val customView = - RemoteViews(currentContext!!.packageName, R.layout.onesignal_bgimage_notif_layout) + RemoteViews(currentContext.packageName, R.layout.onesignal_bgimage_notif_layout) customView.setTextViewText(R.id.os_bgimage_notif_title, _notificationDisplayBuilder.getTitle(fcmJson)) customView.setTextViewText(R.id.os_bgimage_notif_body, fcmJson.optString("alert")) setTextColor( @@ -333,7 +333,7 @@ internal class NotificationDisplayer( customView.setTextColor( viewId, AndroidSupportV4Compat.ContextCompat.getColor( - currentContext!!, + currentContext, colorId, ), ) @@ -358,7 +358,7 @@ internal class NotificationDisplayer( try { var bitmap: Bitmap? = null try { - bitmap = BitmapFactory.decodeStream(currentContext!!.assets.open(bitmapStr)) + bitmap = BitmapFactory.decodeStream(currentContext.assets.open(bitmapStr)) } catch (t: Throwable) { } if (bitmap != null) return bitmap @@ -366,7 +366,7 @@ internal class NotificationDisplayer( for (extension in imageExtensions) { try { bitmap = - BitmapFactory.decodeStream(currentContext!!.assets.open(bitmapStr + extension)) + BitmapFactory.decodeStream(currentContext.assets.open(bitmapStr + extension)) } catch (t: Throwable) { } if (bitmap != null) return bitmap diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/SummaryNotificationDisplayer.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/SummaryNotificationDisplayer.kt index 807844e94d..b2c9af88d1 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/SummaryNotificationDisplayer.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/SummaryNotificationDisplayer.kt @@ -94,8 +94,8 @@ internal class SummaryNotificationDisplayer( groupAlertBehavior: Int, ) { val updateSummary: Boolean = notificationJob.isRestoring - var fcmJson: JSONObject = notificationJob.jsonPayload!! - val intentGenerator = IntentGeneratorForAttachingToNotifications(currentContext!!) + var fcmJson: JSONObject = notificationJob.jsonPayload + val intentGenerator = IntentGeneratorForAttachingToNotifications(currentContext) val group = fcmJson.optString("grp", null) val random = SecureRandom() val summaryDeleteIntent = @@ -113,7 +113,7 @@ internal class SummaryNotificationDisplayer( if (summaryNotificationId == null) { summaryNotificationId = random.nextInt() - _dataController.createSummaryNotification(summaryNotificationId!!, group) + _dataController.createSummaryNotification(summaryNotificationId, group) } val notifications = _dataController.listNotificationsForGroup(group) @@ -141,7 +141,7 @@ internal class SummaryNotificationDisplayer( val summaryContentIntent: PendingIntent? = intentGenerator.getNewActionPendingIntent( random.nextInt(), - createBaseSummaryIntent(summaryNotificationId!!, intentGenerator, fcmJson, group), + createBaseSummaryIntent(summaryNotificationId, intentGenerator, fcmJson, group), ) // 2 or more notifications with a group received, group them together as a single notification. @@ -173,8 +173,8 @@ internal class SummaryNotificationDisplayer( summaryBuilder!!.setContentIntent(summaryContentIntent) .setDeleteIntent(summaryDeleteIntent) .setContentTitle( - currentContext!!.packageManager.getApplicationLabel( - currentContext!!.applicationInfo, + currentContext.packageManager.getApplicationLabel( + currentContext.applicationInfo, ), ) .setContentText(summaryMessage) @@ -230,7 +230,7 @@ internal class SummaryNotificationDisplayer( fcmJson, intentGenerator, summaryBuilder, - summaryNotificationId!!, + summaryNotificationId, group, ) summaryBuilder.setContentIntent(summaryContentIntent) @@ -247,8 +247,8 @@ internal class SummaryNotificationDisplayer( summaryNotification = summaryBuilder.build() _notificationDisplayBuilder.addXiaomiSettings(notifBuilder, summaryNotification) } - NotificationManagerCompat.from(currentContext!!) - .notify(summaryNotificationId!!, summaryNotification) + NotificationManagerCompat.from(currentContext) + .notify(summaryNotificationId, summaryNotification) } @RequiresApi(api = Build.VERSION_CODES.M) @@ -258,13 +258,13 @@ internal class SummaryNotificationDisplayer( grouplessNotifCount: Int, groupAlertBehavior: Int, ) { - val fcmJson: JSONObject = notificationJob.jsonPayload!! + val fcmJson: JSONObject = notificationJob.jsonPayload val summaryNotification: Notification val random = SecureRandom() val group: String = NotificationHelper.GROUPLESS_SUMMARY_KEY val summaryMessage = "$grouplessNotifCount new messages" val summaryNotificationId: Int = NotificationHelper.GROUPLESS_SUMMARY_ID - _dataController.createSummaryNotification(summaryNotificationId!!, group) + _dataController.createSummaryNotification(summaryNotificationId, group) val summaryContentIntent: PendingIntent? = intentGenerator.getNewActionPendingIntent( random.nextInt(), @@ -288,8 +288,8 @@ internal class SummaryNotificationDisplayer( summaryBuilder!!.setContentIntent(summaryContentIntent) .setDeleteIntent(summaryDeleteIntent) .setContentTitle( - currentContext!!.packageManager.getApplicationLabel( - currentContext!!.applicationInfo, + currentContext.packageManager.getApplicationLabel( + currentContext.applicationInfo, ), ) .setContentText(summaryMessage) @@ -309,7 +309,7 @@ internal class SummaryNotificationDisplayer( inboxStyle.setBigContentTitle(summaryMessage) summaryBuilder.setStyle(inboxStyle) summaryNotification = summaryBuilder.build() - NotificationManagerCompat.from(currentContext!!) + NotificationManagerCompat.from(currentContext) .notify(summaryNotificationId, summaryNotification) } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt index cf60d362ac..96f651b8e6 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt @@ -89,7 +89,7 @@ internal class NotificationGenerationWorkManager : INotificationGenerationWorkMa Logging.error("Error occurred doing work for job with id: $id", e) return Result.failure() } finally { - removeNotificationIdProcessed(id!!) + removeNotificationIdProcessed(id) } return Result.success() } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/listeners/NotificationListener.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/listeners/NotificationListener.kt index b74195d4da..f2647b7596 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/listeners/NotificationListener.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/listeners/NotificationListener.kt @@ -70,7 +70,7 @@ internal class NotificationListener( notificationId: String, ) { val config = _configModelStore.model - val appId: String = config.appId ?: "" + val appId: String = config.appId val subscriptionId: String = _subscriptionManager.subscriptions.push.id val deviceType = _deviceService.deviceType diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/permissions/impl/NavigateToAndroidSettingsForNotifications.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/permissions/impl/NavigateToAndroidSettingsForNotifications.kt index 9f0d9752ca..60c96f3435 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/permissions/impl/NavigateToAndroidSettingsForNotifications.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/permissions/impl/NavigateToAndroidSettingsForNotifications.kt @@ -37,11 +37,11 @@ internal object NavigateToAndroidSettingsForNotifications { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) // for Android 5-7 - intent.putExtra("app_package", context.getPackageName()) - intent.putExtra("app_uid", context.getApplicationInfo().uid) + intent.putExtra("app_package", context.packageName) + intent.putExtra("app_uid", context.applicationInfo.uid) // for Android 8 and above - intent.putExtra("android.provider.extra.APP_PACKAGE", context.getPackageName()) + intent.putExtra("android.provider.extra.APP_PACKAGE", context.packageName) context.startActivity(intent) } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt index 98d1611302..f5000d7ecd 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt @@ -52,7 +52,7 @@ internal class PushRegistratorADM( } } - return result!! + return result } override suspend fun fireCallback(id: String?) { diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorNone.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorNone.kt index 035c994d8d..8f7502aad1 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorNone.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorNone.kt @@ -3,7 +3,7 @@ package com.onesignal.notifications.internal.registration.impl import com.onesignal.notifications.internal.registration.IPushRegistrator import com.onesignal.user.internal.subscriptions.SubscriptionStatus -internal class PushRegistratorNone() : IPushRegistrator, IPushRegistratorCallback { +internal class PushRegistratorNone : IPushRegistrator, IPushRegistratorCallback { override suspend fun registerForPush(): IPushRegistrator.RegisterResult { return IPushRegistrator.RegisterResult(null, SubscriptionStatus.ERROR) } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreWorkManager.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreWorkManager.kt index b97d123daf..94201ca677 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreWorkManager.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreWorkManager.kt @@ -36,7 +36,7 @@ internal class NotificationRestoreWorkManager : INotificationRestoreWorkManager OneTimeWorkRequest.Builder(NotificationRestoreWorker::class.java) .setInitialDelay(restoreDelayInSeconds.toLong(), TimeUnit.SECONDS) .build() - WorkManager.getInstance(context!!) + WorkManager.getInstance(context) .enqueueUniqueWork( NOTIFICATION_RESTORE_WORKER_IDENTIFIER, ExistingWorkPolicy.KEEP, diff --git a/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/mocks/DatabaseMockHelper.kt index 4a71a6474b..594e299bce 100644 --- a/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/mocks/DatabaseMockHelper.kt +++ b/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/mocks/DatabaseMockHelper.kt @@ -18,7 +18,7 @@ internal object DatabaseMockHelper { val mockOneSignalDatabase = spyk() if (records != null) { - val mockCursor = cursor(records!!) + val mockCursor = cursor(records) every { mockOneSignalDatabase.query(tableName, any(), any(), any(), any(), any(), any(), any(), any()) } answers {