From 3396fdbd995b88b409259cd63ef6f98a32187c0e Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Wed, 29 May 2019 23:50:37 -0400 Subject: [PATCH] Check with Call Control to see if we should block message --- data/build.gradle | 1 + data/libs/callcontrol-datashare-release.aar | Bin 0 -> 6456 bytes .../blocking/CallControlBlockingClient.kt | 51 ++++++++++++++++++ .../moez/QKSMS/blocking/QkBlockingClient.kt | 30 +++++++++++ .../blocking/ShouldIAnswerBlockingClient.kt | 5 +- .../com/moez/QKSMS/interactor/ReceiveMms.kt | 2 + .../com/moez/QKSMS/interactor/ReceiveSms.kt | 5 +- presentation/src/main/AndroidManifest.xml | 3 ++ .../com/moez/QKSMS/injection/AppModule.kt | 16 ++++-- 9 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 data/libs/callcontrol-datashare-release.aar create mode 100644 data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt create mode 100644 data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt diff --git a/data/build.gradle b/data/build.gradle index 915ed179..031be0bb 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -81,6 +81,7 @@ dependencies { implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation files('libs/callcontrol-datashare-release.aar') implementation project(":android-smsmms") implementation project(':common') implementation project(':domain') diff --git a/data/libs/callcontrol-datashare-release.aar b/data/libs/callcontrol-datashare-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..24c2fd79da7a6a1f3e7b86d2d4b767c735f1dcff GIT binary patch literal 6456 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 literal 0 HcmV?d00001 diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt new file mode 100644 index 00000000..758d4bf4 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.blocking + +import android.content.Context +import android.database.Cursor +import android.net.Uri +import androidx.core.database.getStringOrNull +import com.callcontrol.datashare.CallControl +import com.moez.QKSMS.extensions.map +import com.moez.QKSMS.util.tryOrNull +import io.reactivex.Single +import javax.inject.Inject + +class CallControlBlockingClient @Inject constructor( + private val context: Context +) : BlockingClient { + + class LookupResult(cursor: Cursor) { + val displayName: String? = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(CallControl.Lookup.DISPLAY_NAME)) + val blockReason: String? = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(CallControl.Lookup.BLOCK_REASON)) + } + + override fun shouldBlock(address: String): Single { + val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address) + return Single.fromCallable { + tryOrNull { + context.contentResolver.query(uri, null, null, null, null) // Query URI + ?.use { cursor -> cursor.map(::LookupResult) } // Map to Result object + ?.any { result -> result.blockReason != null } // Check if any are blocked + } == true // If none are blocked or we errored at some point, return false + } + } + +} diff --git a/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt new file mode 100644 index 00000000..15f53f3a --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.blocking + +import io.reactivex.Single +import javax.inject.Inject + +class QkBlockingClient @Inject constructor() : BlockingClient { + + override fun shouldBlock(address: String): Single { + return Single.just(false) // TODO: This will be implemented once we're able to reject these messages entirely + } + +} diff --git a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt index a427a2b5..9f62715d 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt @@ -32,7 +32,6 @@ import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull import io.reactivex.Single import io.reactivex.subjects.SingleSubject -import timber.log.Timber import javax.inject.Inject class ShouldIAnswerBlockingClient @Inject constructor( @@ -104,9 +103,7 @@ class ShouldIAnswerBlockingClient @Inject constructor( what = GET_NUMBER_RATING data = bundleOf("number" to address) replyTo = Messenger(IncomingHandler { response -> - val shouldBlock = response.rating == RATING_NEGATIVE || response.wantBlock - subject.onSuccess(shouldBlock) - Timber.v("Should block: $shouldBlock") + subject.onSuccess(response.rating == RATING_NEGATIVE || response.wantBlock) // We're done, so unbind the service if (isBound && serviceMessenger != null) { diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt index a635f7c5..c13f0e00 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt @@ -27,6 +27,7 @@ import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable +import timber.log.Timber import javax.inject.Inject class ReceiveMms @Inject constructor( @@ -55,6 +56,7 @@ class ReceiveMms @Inject constructor( // turns out that it should be blocked, then delete it // TODO Don't store blocked messages in the first place !blockingClient.shouldBlock(message.address).blockingGet().also { blocked -> + Timber.v("Should block: $blocked") if (blocked) messageRepo.deleteMessages(message.id) } } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index b706f8a8..675ff9e1 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -26,6 +26,7 @@ import com.moez.QKSMS.manager.ShortcutManager import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable +import timber.log.Timber import javax.inject.Inject class ReceiveSms @Inject constructor( @@ -45,7 +46,9 @@ class ReceiveSms @Inject constructor( .filter { // Don't continue if the sender is blocked val address = it.messages[0].displayOriginatingAddress - !blockingClient.shouldBlock(address).blockingGet() + val shouldBlock = blockingClient.shouldBlock(address).blockingGet() + Timber.v("Should block: $shouldBlock") + !shouldBlock } .map { val messages = it.messages diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index bdc4132e..47b1260b 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -194,6 +194,9 @@ + diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index 089d3b0f..1067969f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -26,6 +26,8 @@ import android.preference.PreferenceManager import androidx.lifecycle.ViewModelProvider import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.blocking.BlockingClient +import com.moez.QKSMS.blocking.CallControlBlockingClient +import com.moez.QKSMS.blocking.QkBlockingClient import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient import com.moez.QKSMS.common.ViewModelFactory import com.moez.QKSMS.common.util.NotificationManagerImpl @@ -76,6 +78,7 @@ import com.moez.QKSMS.repository.ScheduledMessageRepository import com.moez.QKSMS.repository.ScheduledMessageRepositoryImpl import com.moez.QKSMS.repository.SyncRepository import com.moez.QKSMS.repository.SyncRepositoryImpl +import com.moez.QKSMS.util.Preferences import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import dagger.Module @@ -129,7 +132,16 @@ class AppModule(private var application: Application) { fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager @Provides - fun externalBlockingManager(manager: ShouldIAnswerBlockingClient): BlockingClient = manager + fun externalBlockingManager( + callControl: CallControlBlockingClient, + sia: ShouldIAnswerBlockingClient, + qksms: QkBlockingClient, + prefs: Preferences + ): BlockingClient = when { + prefs.callControl.get() -> callControl + prefs.sia.get() -> sia + else -> qksms + } @Provides fun changelogManager(manager: ChangelogManagerImpl): ChangelogManager = manager @@ -152,7 +164,6 @@ class AppModule(private var application: Application) { @Provides fun provideWidgetManager(manager: WidgetManagerImpl): WidgetManager = manager - // Mapper @Provides @@ -170,7 +181,6 @@ class AppModule(private var application: Application) { @Provides fun provideCursorToRecipient(mapper: CursorToRecipientImpl): CursorToRecipient = mapper - // Repository @Provides