Merge branch 'master' into feature/itbl-track-anon-user

# Conflicts:
#	CHANGELOG.md
#	iterableapi-ui/build.gradle
#	iterableapi/build.gradle
#	sample-apps/inbox-customization/app/build.gradle

Author: Evan Greer

CHANGELOG.md

@@ -4,6 +4,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [3.5.16]
+### Added
+- Added offline support for disable push API requests, allowing requests to be queued and processed when network connectivity is restored
+
+### Fixed
+- Fixed KeyStoreException crash on Nexus 5 devices by adding proper error handling for SecretKeyEntry operations
+- Added graceful fallback to plaintext storage when encryption initialization fails
+
+## [3.5.15]
+### Fixed
+- Fixed JWT token refresh issues when app is in background, ensuring reliable token refresh in all app states
+- Fixed inbox metadata null check issues to prevent crashes in inbox display
+
+### Changed
+- Migrated embedded message OOTB views to use Material Design buttons for better UI consistency
+- Updated sample app Gradle configuration to use newer versions for better compatibility
+
 ## [3.6.0-beta3]
 
 ### Added

iterableapi-ui/build.gradle

@@ -61,7 +61,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi-ui'
-    libraryVersion = '3.6.0-beta3'
+    libraryVersion = '3.5.16'
 }
 
 if (hasProperty("mavenPublishEnabled")) {

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt

@@ -94,23 +94,11 @@ class IterableEmbeddedView(
         val titleText = view.findViewById<TextView>(R.id.embedded_message_title)
         val bodyText = view.findViewById<TextView>(R.id.embedded_message_body)
 
-        if(config?.primaryBtnBackgroundColor != null) {
-            val primaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
-                ContextCompat.getDrawable(requireContext(), R.drawable.primary_notification_button_background) as? GradientDrawable
-                else ContextCompat.getDrawable(requireContext(), R.drawable.primary_banner_button_background) as? GradientDrawable
-            primaryBtnBackgroundDrawable?.setColor(primaryBtnBackgroundColor)
-
-            firstButton.background = primaryBtnBackgroundDrawable
-        }
-
-        if(config?.secondaryBtnBackgroundColor != null) {
-            val secondaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
-                ContextCompat.getDrawable(requireContext(), R.drawable.secondary_notification_button_background) as? GradientDrawable
-                else ContextCompat.getDrawable(requireContext(), R.drawable.secondary_banner_button_background) as? GradientDrawable
-            secondaryBtnBackgroundDrawable?.setColor(secondaryBtnBackgroundColor)
+        firstButton.setBackgroundColor(primaryBtnBackgroundColor)
+        firstButton.setTextColor(primaryBtnTextColor)
 
-            secondButton.background = secondaryBtnBackgroundDrawable
-        }
+        secondButton.setBackgroundColor(secondaryBtnBackgroundColor)
+        secondButton.setTextColor(secondaryBtnTextColor)
 
         firstButton.setTextColor(primaryBtnTextColor)
         secondButton.setTextColor(secondaryBtnTextColor)

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxAdapter.java

@@ -70,14 +70,14 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         IterableInAppMessage.InboxMetadata inboxMetadata = inboxRow.inboxMetadata;
 
         if (holder.title != null) {
-            holder.title.setText(inboxMetadata.title);
+            holder.title.setText(inboxMetadata != null && inboxMetadata.title != null ? inboxMetadata.title : "");
         }
 
         if (holder.subtitle != null) {
-            holder.subtitle.setText(inboxMetadata.subtitle);
+            holder.subtitle.setText(inboxMetadata != null && inboxMetadata.subtitle != null ? inboxMetadata.subtitle : "");
         }
 
-        if (holder.icon != null) {
+        if (holder.icon != null && inboxMetadata != null && inboxMetadata.icon != null) {
             BitmapLoader.loadBitmap(holder.icon, Uri.parse(inboxMetadata.icon));
         }