diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
| commit | e6af789bf50f9636d3455c4bd1b662ab5d04e3e2 (patch) | |
| tree | 35e7560cd785aa20c1fa814332d16bd094921282 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java | |
| parent | 5e53a5417c11f54f437d9f220d3e2e8579b8bf1b (diff) | |
| parent | 145e793db1d732bdd230be92750123cd20c9502d (diff) | |
| download | open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.gz open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.bz2 open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java index 2dae38cc4..42e9ec3f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/LinkedVerifyResult.java @@ -18,21 +18,7 @@ package org.sufficientlysecure.keychain.operations.results; -import android.app.Activity; -import android.content.Intent; import android.os.Parcel; -import android.os.Parcelable; -import android.view.View; - -import com.github.johnpersano.supertoasts.SuperCardToast; -import com.github.johnpersano.supertoasts.SuperToast; -import com.github.johnpersano.supertoasts.SuperToast.Duration; -import com.github.johnpersano.supertoasts.util.OnClickWrapper; -import com.github.johnpersano.supertoasts.util.Style; - -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.LogDisplayActivity; -import org.sufficientlysecure.keychain.ui.LogDisplayFragment; public class LinkedVerifyResult extends OperationResult { |