forked from upstream-mirrors/quik
Allow sharing vCard from other apps
This commit is contained in:
@@ -90,6 +90,11 @@
|
|||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<data android:mimeType="image/*" />
|
<data android:mimeType="image/*" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.SEND" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<data android:mimeType="text/x-vcard" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="android.service.chooser.chooser_target_service"
|
android:name="android.service.chooser.chooser_target_service"
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ package com.moez.QKSMS.feature.compose
|
|||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
|
import androidx.core.net.toFile
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
|
import com.google.android.mms.ContentType
|
||||||
import com.moez.QKSMS.injection.ViewModelKey
|
import com.moez.QKSMS.injection.ViewModelKey
|
||||||
import com.moez.QKSMS.model.Attachment
|
import com.moez.QKSMS.model.Attachment
|
||||||
import com.moez.QKSMS.model.Attachments
|
import com.moez.QKSMS.model.Attachments
|
||||||
@@ -28,6 +30,7 @@ import dagger.Module
|
|||||||
import dagger.Provides
|
import dagger.Provides
|
||||||
import dagger.multibindings.IntoMap
|
import dagger.multibindings.IntoMap
|
||||||
import java.net.URLDecoder
|
import java.net.URLDecoder
|
||||||
|
import java.nio.charset.Charset
|
||||||
import javax.inject.Named
|
import javax.inject.Named
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@@ -73,10 +76,25 @@ class ComposeActivityModule {
|
|||||||
@Provides
|
@Provides
|
||||||
@Named("attachments")
|
@Named("attachments")
|
||||||
fun provideSharedAttachments(activity: ComposeActivity): Attachments {
|
fun provideSharedAttachments(activity: ComposeActivity): Attachments {
|
||||||
val sharedImages = mutableListOf<Uri>()
|
val uris = mutableListOf<Uri>()
|
||||||
activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(sharedImages::add)
|
activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::add)
|
||||||
activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(sharedImages::addAll)
|
activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::addAll)
|
||||||
return Attachments(sharedImages.map { Attachment.Image(it) })
|
return Attachments(uris.mapNotNull { uri ->
|
||||||
|
val mimeType = activity.contentResolver.getType(uri)
|
||||||
|
when {
|
||||||
|
ContentType.isImageType(mimeType) -> {
|
||||||
|
Attachment.Image(uri)
|
||||||
|
}
|
||||||
|
|
||||||
|
ContentType.TEXT_VCARD.equals(mimeType, true) -> {
|
||||||
|
val inputStream = activity.contentResolver.openInputStream(uri)
|
||||||
|
val text = inputStream?.reader(Charset.forName("utf-8"))?.readText()
|
||||||
|
text?.let(Attachment::Contact)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@@ -88,7 +106,7 @@ class ComposeActivityModule {
|
|||||||
private fun Intent.decodedDataString(): String? {
|
private fun Intent.decodedDataString(): String? {
|
||||||
val data = data?.toString()
|
val data = data?.toString()
|
||||||
if (data?.contains('%') == true) {
|
if (data?.contains('%') == true) {
|
||||||
return URLDecoder.decode(data, "UTF-8")
|
return URLDecoder.decode(data, "UTF-8")
|
||||||
}
|
}
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user