Merge branch 'master' into jay/MOB-4439-update-email

Author: roninopf

sample-apps/inbox-customization/app/build.gradle

@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.iterable.inbox_customization"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

sample-apps/inbox-customization/app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

sample-apps/inbox-customization/app/src/main/java/com/iterable/inbox_customization/util/SingleFragmentActivity.kt

@@ -12,11 +12,13 @@ class SingleFragmentActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val fragmentName = intent.getStringExtra(FRAGMENT_NAME)
-        val fragment: Fragment = Fragment.instantiate(this, fragmentName)
+        val fragment: Fragment? = fragmentName?.let { Fragment.instantiate(this, it) }
         val fragmentArguments = intent.getBundleExtra(FRAGMENT_ARGUMENTS)
-        fragment.arguments = fragmentArguments
-        supportFragmentManager.beginTransaction()
-            .replace(android.R.id.content, fragment, "fragment").commit()
+        fragment?.arguments = fragmentArguments
+        fragment?.let {
+            supportFragmentManager.beginTransaction()
+                .replace(android.R.id.content, it, "fragment").commit()
+        }
     }
 
     companion object {

sample-apps/inbox-customization/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.5.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files