From 452f3600db35c34dd129ebb58ea92e7644b44bb4 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 3 Jul 2018 20:43:28 +0200 Subject: [PATCH] move EncryptRecipientDropdownAdapter to chips package --- .../keychain/ui/chips/EncryptRecipientChipAdapter.java | 2 +- .../keychain/ui/chips/EncryptRecipientChipsInput.java | 1 - .../{adapter => chips}/EncryptRecipientDropdownAdapter.java | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/{adapter => chips}/EncryptRecipientDropdownAdapter.java (89%) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java index 4f7bc6642..524bf4823 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java @@ -19,7 +19,7 @@ import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.Encry public class EncryptRecipientChipAdapter extends ChipsAdapter { - public EncryptRecipientChipAdapter(Context context, ChipsInput chipsInput) { + EncryptRecipientChipAdapter(Context context, ChipsInput chipsInput) { super(context, chipsInput); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java index 41fd161fc..5b031d268 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java @@ -9,7 +9,6 @@ import android.util.AttributeSet; import com.pchmn.materialchips.ChipsInput; import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo; -import org.sufficientlysecure.keychain.ui.adapter.EncryptRecipientDropdownAdapter; import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.EncryptRecipientChip; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/EncryptRecipientDropdownAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java similarity index 89% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/EncryptRecipientDropdownAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java index 811cd85e0..9d8609dca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/EncryptRecipientDropdownAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java @@ -1,4 +1,4 @@ -package org.sufficientlysecure.keychain.ui.adapter; +package org.sufficientlysecure.keychain.ui.chips; import java.util.List; @@ -14,15 +14,15 @@ import android.widget.TextView; import com.pchmn.materialchips.ChipsInput; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.adapter.EncryptRecipientDropdownAdapter.ItemViewHolder; import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.EncryptRecipientChip; +import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientDropdownAdapter.ItemViewHolder; import org.sufficientlysecure.keychain.ui.util.KeyInfoFormatter; public class EncryptRecipientDropdownAdapter extends ChipsInput.ChipDropdownAdapter { private final LayoutInflater layoutInflater; - public EncryptRecipientDropdownAdapter(Context context, List keyInfoChips) { + EncryptRecipientDropdownAdapter(Context context, List keyInfoChips) { super(keyInfoChips); layoutInflater = LayoutInflater.from(context);