Projects >> apg >>040cf42cb07c0bc58aceb048804c6d9359754499

Chunk
Conflicting content 
    /**
     * Signs and/or encrypts data based on parameters of class
     */
<<<<<<< HEAD
    public PgpSignEncryptResult execute(PgpSignEncryptInputParcel input,
                                     InputData inputData, OutputStream outputStream) {
=======
    public PgpSignEncryptResult execute(PgpSignEncryptInput input,
                                        InputData inputData, OutputStream outputStream) {
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866

        int indent = 0;
        OperationLog log = new OperationLog();
Solution content 
    /**
     * Signs and/or encrypts data based on parameters of class
     */
    public PgpSignEncryptResult execute(PgpSignEncryptInputParcel input,
                                     InputData inputData, OutputStream outputStream) {

        int indent = 0;
        OperationLog log = new OperationLog();
File
PgpSignEncryptOperation.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralMsgIdException;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler.MessageStatus;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler.MessageStatus;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.Log;
Solution content 
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralMsgIdException;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler.MessageStatus;
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.Log;
File
KeychainIntentService.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.service.CertifyActionsParcel;
import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.ui.adapter.MultiUserIdsAdapter;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.ui.util.Notify;
Solution content 
import org.sufficientlysecure.keychain.service.CertifyActionsParcel;
import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.ui.adapter.MultiUserIdsAdapter;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.ui.util.Notify;
File
CertifyKeyFragment.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        } else {

            // Message is received after signing is done in KeychainIntentService
<<<<<<< HEAD
            KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
                    getActivity(), getString(R.string.progress_certifying),
                    ProgressDialog.STYLE_SPINNER, true) {
=======
            ServiceProgressHandler saveHandler = new ServiceProgressHandler(
                    getActivity(),
                    getString(R.string.progress_certifying),
                    ProgressDialog.STYLE_SPINNER,
                    true,
                    ProgressDialogFragment.ServiceType.KEYCHAIN_INTENT) {
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
                public void handleMessage(Message message) {
                    // handle messages by KeychainIntentCryptoServiceHandler first
                    super.handleMessage(message);
Solution content 
        } else {

            // Message is received after signing is done in KeychainIntentService
            ServiceProgressHandler saveHandler = new ServiceProgressHandler(
                    getActivity(),
                    getString(R.string.progress_certifying),
                    ProgressDialog.STYLE_SPINNER,
                    true,
                    ProgressDialogFragment.ServiceType.KEYCHAIN_INTENT) {
                public void handleMessage(Message message) {
                    // handle messages by KeychainIntentCryptoServiceHandler first
                    super.handleMessage(message);
File
CertifyKeyFragment.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyChange;
Solution content 
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyChange;
File
EditKeyFragment.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.operations.results.SignEncryptResult;
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.util.Passphrase;
Solution content 
import org.sufficientlysecure.keychain.operations.results.SignEncryptResult;
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.util.Passphrase;
File
EncryptActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
=======
import org.sufficientlysecure.keychain.service.CloudImportService;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log;
Solution content 
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
import org.sufficientlysecure.keychain.service.CloudImportService;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log;
File
ImportKeysActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.ParcelableFileCache;
Solution content 
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.ParcelableFileCache;
File
SafeSlingerActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
<<<<<<< HEAD
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
=======
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
>>>>>>> eeccd7cd1475f02a9f4650f1debc38ab6a66d866
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences;
Solution content 
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences;
File
UploadKeyActivity.java
Developer's decision
Combination
Kind of conflict
Import