Projects >> apg >>36376c49997b82ac74871c922e2f1ba75b8e214f

Chunk
Conflicting content 
                            ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId),
                            oldPassPhrase, newPassPhrase);
                } else {
<<<<<<< HEAD
                    //TODO: Workaround due to ProviderHelper.getPGPPublicKeyByKeyId can not resolve public key of master-key id with uri/cursor
=======
>>>>>>> 4e285d9254f98381bd59a9a683d406ad1b6020d6
                    PGPPublicKey pubkey = null;
                    for(PGPSecretKey key : keys) {
                        PGPPublicKey tempKey = key.getPublicKey();
Solution content 
                            ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId),
                            oldPassPhrase, newPassPhrase);
                } else {
                    //TODO: Workaround due to ProviderHelper.getPGPPublicKeyByKeyId can not resolve public key of master-key id with uri/cursor
                    PGPPublicKey pubkey = null;
                    for(PGPSecretKey key : keys) {
                        PGPPublicKey tempKey = key.getPublicKey();
File
KeychainIntentService.java
Developer's decision
Version 1
Kind of conflict
Comment