Merge branch 'develop'

airmessage · Sep 14, 2021 · d4ddcca · d4ddcca
2 parents 96b606f + ba35845
commit d4ddcca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,8 +52,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 31
-		versionName "3.3.2"
-		versionCode 126
+		versionName "3.3.3"
+		versionCode 127
 
 		resConfigs "en", "fr", "ja"
 

diff --git a/app/src/main/java/me/tagavari/airmessage/activity/Messaging.java b/app/src/main/java/me/tagavari/airmessage/activity/Messaging.java
@@ -380,7 +380,7 @@ public void onCreate(Bundle savedInstanceState) {
 				layoutParams.rightMargin = insets.right;
 			} else {
 				//Simply applying padding to the entire root view
-				rootView.setPadding(rootView.getPaddingLeft(), rootView.getPaddingTop(), rootView.getPaddingRight(), insets.bottom);
+				rootView.setPadding(rootView.getPaddingLeft(), rootView.getPaddingTop(), rootView.getPaddingRight(), windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom);
 			}
 
 			return windowInsets;

diff --git a/app/src/main/java/me/tagavari/airmessage/helper/NotificationHelper.kt b/app/src/main/java/me/tagavari/airmessage/helper/NotificationHelper.kt
@@ -771,7 +771,7 @@ object NotificationHelper {
 	@JvmStatic
 	fun getNotification(notificationManager: NotificationManager, tag: String?, id: Int): Notification? {
 		return notificationManager.activeNotifications
-				.firstOrNull { notification: StatusBarNotification -> notification.tag == tag && notification.id == id }
+				?.firstOrNull { notification: StatusBarNotification -> notification.tag == tag && notification.id == id }
 				?.notification
 	}