diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index d70e29d4..71502bba 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -26,4 +26,11 @@ android:grantUriPermissions="true"> + + + + + + + diff --git a/domain/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt b/domain/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt index ba525a53..8a5c14d5 100644 --- a/domain/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt +++ b/domain/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt @@ -136,21 +136,25 @@ fun Uri.contactToVCard(context: Context): Uri = } fun Uri.getDefaultActivityIconForMimeType(context: Context): Drawable? = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - context.packageManager - .queryIntentActivities( - Intent(Intent.ACTION_VIEW).setDataAndType(this, getType(context)), - PackageManager.ResolveInfoFlags.of( - PackageManager.MATCH_DEFAULT_ONLY.toLong() - ) - ).let { - if (it.size > 0) it[0].loadIcon(context.packageManager) - else null - } - } else { - context.packageManager - .resolveActivity( - Intent(Intent.ACTION_VIEW).setDataAndType(this, getType(context)), - PackageManager.MATCH_DEFAULT_ONLY) - ?.loadIcon(context.packageManager) - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + context.packageManager + .queryIntentActivities( + Intent(Intent.ACTION_VIEW).setDataAndType(this, getType(context)), + PackageManager.ResolveInfoFlags.of( + PackageManager.MATCH_DEFAULT_ONLY.toLong() + ) + ).let { + if (it.size > 0) it[0].loadIcon(context.packageManager) + else null + } + } else { + // else, pre-tiramisu versions + context.packageManager + .queryIntentActivities( + Intent(Intent.ACTION_VIEW).setDataAndType(this, getType(context)), + PackageManager.MATCH_DEFAULT_ONLY + ).let { + if (it.size > 0) it[0].loadIcon(context.packageManager) + else null + } + } diff --git a/presentation/src/main/res/layout/attachment_file_list_item.xml b/presentation/src/main/res/layout/attachment_file_list_item.xml index b14e7827..1c5b4946 100644 --- a/presentation/src/main/res/layout/attachment_file_list_item.xml +++ b/presentation/src/main/res/layout/attachment_file_list_item.xml @@ -21,6 +21,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:background="?attr/bubbleColor"> @@ -61,6 +62,6 @@ android:background="@drawable/circle" android:backgroundTint="?attr/bubbleColor" android:src="@drawable/ic_cancel_black_24dp" - android:tint="?android:attr/textColorSecondary" /> + app:tint="?android:attr/textColorSecondary" /> \ No newline at end of file diff --git a/presentation/src/main/res/layout/scheduled_message_image_list_item.xml b/presentation/src/main/res/layout/scheduled_message_image_list_item.xml index 0f85dc04..55d6f4e7 100644 --- a/presentation/src/main/res/layout/scheduled_message_image_list_item.xml +++ b/presentation/src/main/res/layout/scheduled_message_image_list_item.xml @@ -34,11 +34,11 @@