From 2fc416933be32f1716836e51e8a07036e9d0e2f7 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 7 Dec 2023 19:02:18 +0100 Subject: [PATCH] No security provider updates for F-Droid build --- app/build.gradle | 7 +++--- .../eu/faircode/email/ApplicationSecure.java | 24 +------------------ .../eu/faircode/email/ApplicationSecure.java | 24 +------------------ 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4e8f3c537a..3e53336e2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -656,10 +656,9 @@ dependencies { playImplementation "com.android.billingclient:billing:$billingclient_version" // https://mvnrepository.com/artifact/com.google.android.gms/play-services-base - //githubImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" - //largeImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" - //playImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" - implementation "com.google.android.gms:play-services-basement:$playservicesbase_version" + githubImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" + largeImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" + playImplementation "com.google.android.gms:play-services-basement:$playservicesbase_version" // https://developer.amazon.com/docs/in-app-purchasing/iap-get-started.html amazonImplementation files('lib/in-app-purchasing-2.0.76.jar') diff --git a/app/src/amazon/java/eu/faircode/email/ApplicationSecure.java b/app/src/amazon/java/eu/faircode/email/ApplicationSecure.java index 76c6fa32ba..acfc328304 100644 --- a/app/src/amazon/java/eu/faircode/email/ApplicationSecure.java +++ b/app/src/amazon/java/eu/faircode/email/ApplicationSecure.java @@ -1,26 +1,4 @@ package eu.faircode.email; -import android.content.Intent; - -import com.google.android.gms.security.ProviderInstaller; - -public class ApplicationSecure extends ApplicationEx implements ProviderInstaller.ProviderInstallListener { - @Override - public void onCreate() { - super.onCreate(); - Log.i("Security provider check"); - ProviderInstaller.installIfNeededAsync(this, this); - } - - @Override - public void onProviderInstalled() { - Log.i("Security provider installed"); - } - - @Override - public void onProviderInstallFailed(int errorCode, Intent recoveryIntent) { - Log.i("Security provider install failed" + - " errorCode=" + errorCode + - " recoveryIntent=" + recoveryIntent); - } +public class ApplicationSecure extends ApplicationEx { } diff --git a/app/src/fdroid/java/eu/faircode/email/ApplicationSecure.java b/app/src/fdroid/java/eu/faircode/email/ApplicationSecure.java index 76c6fa32ba..acfc328304 100644 --- a/app/src/fdroid/java/eu/faircode/email/ApplicationSecure.java +++ b/app/src/fdroid/java/eu/faircode/email/ApplicationSecure.java @@ -1,26 +1,4 @@ package eu.faircode.email; -import android.content.Intent; - -import com.google.android.gms.security.ProviderInstaller; - -public class ApplicationSecure extends ApplicationEx implements ProviderInstaller.ProviderInstallListener { - @Override - public void onCreate() { - super.onCreate(); - Log.i("Security provider check"); - ProviderInstaller.installIfNeededAsync(this, this); - } - - @Override - public void onProviderInstalled() { - Log.i("Security provider installed"); - } - - @Override - public void onProviderInstallFailed(int errorCode, Intent recoveryIntent) { - Log.i("Security provider install failed" + - " errorCode=" + errorCode + - " recoveryIntent=" + recoveryIntent); - } +public class ApplicationSecure extends ApplicationEx { }