Using ClientVerification

Author: develric

WordPress/src/main/java/org/wordpress/android/reader/savedposts/provider/ReaderSavedPostsProvider.kt

@@ -8,16 +8,16 @@ import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.ReaderTagType.BOOKMARKED
 import org.wordpress.android.provider.query.QueryContentProvider
 import org.wordpress.android.provider.query.QueryResult
+import org.wordpress.android.util.publicdata.ClientVerification
 import org.wordpress.android.util.publicdata.JetpackPublicData
 import org.wordpress.android.util.signature.SignatureNotFoundException
-import org.wordpress.android.util.signature.SignatureUtils
 import javax.inject.Inject
 
-class ReaderSavedPostsProvider  : QueryContentProvider() {
+class ReaderSavedPostsProvider : QueryContentProvider() {
     @Inject lateinit var queryResult: QueryResult
     @Inject lateinit var readerPostTableWrapper: ReaderPostTableWrapper
-    @Inject lateinit var signatureUtils: SignatureUtils
     @Inject lateinit var jetpackPublicData: JetpackPublicData
+    @Inject lateinit var clientVerification: ClientVerification
 
     override fun onCreate(): Boolean {
         return true
@@ -34,11 +34,7 @@ class ReaderSavedPostsProvider  : QueryContentProvider() {
         inject()
         return context?.let {
             try {
-                val callerPackageId = callingPackage
-                val callerExpectedPackageId = jetpackPublicData.currentPackageId()
-                val callerSignatureHash = signatureUtils.getSignatureHash(it, callerExpectedPackageId)
-                val callerExpectedSignatureHash = jetpackPublicData.currentPublicKeyHash()
-                if (callerPackageId == callerExpectedPackageId && callerSignatureHash == callerExpectedSignatureHash) {
+                if (clientVerification.canTrust(callingPackage)) {
                     val posts = readerPostTableWrapper.getPostsWithTag(
                             readerTag = ReaderTag("", "", "", "", BOOKMARKED),
                             maxRows = 0,