Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efc121c0 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '5491-disable_openPGP_support_by_default' into 'main' 

5491-Disable_openPGP_support_by_default

See merge request !81
parents 73f86fe6 882c5625

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java

+0 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.fsck.k9.view.ClientCertificateSpinner; 
import com.fsck.k9.view.ClientCertificateSpinner.OnClientCertificateChangedListener;

import com.google.android.material.textfield.TextInputEditText;

import com.google.android.material.textfield.TextInputLayout;

import org.openintents.openpgp.util.OpenPgpProviderUtil;

import timber.log.Timber;



/**
@@ -253,7 +252,6 @@ public class AccountSetupBasics extends K9Activity 
        if (mAccount == null) {

            mAccount = Preferences.getPreferences(this).newAccount();

            mAccount.setChipColor(accountCreator.pickColor());

            mAccount.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(getApplicationContext()));

        }



        mAccount.setSenderName(getOwnerName());
@@ -380,7 +378,6 @@ public class AccountSetupBasics extends K9Activity 
        if (mAccount == null) {

            mAccount = Preferences.getPreferences(this).newAccount();

            mAccount.setChipColor(accountCreator.pickColor());

            mAccount.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(getApplicationContext()));

        }

        mAccount.setSenderName(getOwnerName());

        mAccount.setEmail(email);

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import com.fsck.k9.mail.ServerSettings; 
import com.fsck.k9.mailstore.SpecialLocalFoldersCreator;

import com.fsck.k9.preferences.Protocols;

import com.fsck.k9.ui.ConnectionSettings;

import org.openintents.openpgp.util.OpenPgpProviderUtil;

import timber.log.Timber;
@@ -35,7 +34,6 @@ public class EeloAccountCreator { 
        account.setChipColor(accountCreator.pickColor());

        account.setEmail(emailId);

        account.setName(emailId);

        account.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(context.getApplicationContext()));



        ConnectionSettings connectionSettings = providersXmlDiscoveryDiscover(emailId);

        if (connectionSettings == null) {

plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java

+0 −11
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;



import androidx.annotation.Nullable;





public class OpenPgpProviderUtil {

    private static final String PACKAGE_NAME_APG = "org.thialfihar.android.apg";
@@ -19,15 +17,6 @@ public class OpenPgpProviderUtil { 
        DISALLOWED_PROVIDERS.add(PACKAGE_NAME_APG);

    }



    @Nullable

    public static String getOpenPgpProviderPackage(Context context) {

        List<String> openPgpProviderPackages = getOpenPgpProviderPackages(context);

        if (openPgpProviderPackages.size() > 0) {

            return openPgpProviderPackages.get(0);

        }

        return null;

    }



    public static List<String> getOpenPgpProviderPackages(Context context) {

        ArrayList<String> result = new ArrayList<>();