PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

move ViewKeyActivity classes into their own package structure

Browse source
This commit is contained in:
Vincent Breitmoser 2017-05-21 05:12:45 +02:00
parent 1331d3960c
commit b328c97853
28 changed files with 117 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OpenKeychain/src/main/AndroidManifest.xml
View file

@ -162,13 +162,13 @@
android:name=".ui.linked.LinkedIdWizard"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_linked_create"
android:parentActivityName=".ui.ViewKeyActivity" />
android:parentActivityName=".ui.keyview.ViewKeyActivity" />
<!-- NOTE: Dont use configChanges for QR Code view! We use a different layout for landscape -->
<activity
android:name=".ui.QrCodeViewActivity"
android:label="@string/share_qr_code_dialog_title" />
<activity
android:name=".ui.ViewKeyActivity"
android:name=".ui.keyview.ViewKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_key_details"
android:parentActivityName=".ui.MainActivity">
@ -185,10 +185,10 @@
android:name=".ui.ViewCertActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_view_cert"
android:parentActivityName=".ui.ViewKeyActivity">
android:parentActivityName=".ui.keyview.ViewKeyActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.ViewKeyActivity" />
android:value=".ui.keyview.ViewKeyActivity" />
</activity>
<activity
android:name=".ui.SafeSlingerActivity"
@ -463,10 +463,10 @@
android:name=".ui.UploadKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_send_key"
android:parentActivityName=".ui.ViewKeyActivity">
android:parentActivityName=".ui.keyview.ViewKeyActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.ViewKeyActivity" />
android:value=".ui.keyview.ViewKeyActivity" />
</activity>
<activity
android:name=".ui.ViewKeyAdvActivity"

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java
View file

@ -39,7 +39,7 @@ import org.sufficientlysecure.keychain.remote.ui.RequestKeyPermissionActivity;
import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
public class ApiPendingIntentFactory {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SecurityProblemPresenter.java
View file

@ -38,7 +38,7 @@ import org.sufficientlysecure.keychain.pgp.SecurityProblem.EncryptionAlgorithmPr
import org.sufficientlysecure.keychain.pgp.SecurityProblem.UnidentifiedKeyProblem;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.OverriddenWarningsRepository;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
class SecurityProblemPresenter {

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View file

@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.securitytoken.KeyFormat;
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.Passphrase;
import org.sufficientlysecure.keychain.util.Preferences;

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
View file

@ -27,14 +27,12 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.TextView;
import org.bouncycastle.util.encoders.Hex;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.keyimport.processing.CloudLoaderState;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenHelper;
@ -44,7 +42,7 @@ import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.SecurityTokenListenerFragment;
import org.sufficientlysecure.keychain.ui.base.QueueingCryptoOperationFragment;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
import org.sufficientlysecure.keychain.util.Preferences;

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
View file

@ -54,6 +54,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
import org.sufficientlysecure.keychain.ui.util.Notify;

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View file

@ -84,6 +84,7 @@ import org.sufficientlysecure.keychain.service.InputDataParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.base.QueueingCryptoOperationFragment;
// this import NEEDS to be above the ViewModel AND SubViewHolder one, or it won't compile! (as of 16.09.15)
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.StatusHolder;
import org.sufficientlysecure.keychain.ui.DecryptListFragment.ViewHolder.SubViewHolder;
import org.sufficientlysecure.keychain.ui.DecryptListFragment.DecryptFilesAdapter.ViewModel;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View file

@ -65,7 +65,7 @@ import org.sufficientlysecure.keychain.service.ConsolidateInputParcel;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.adapter.KeySectionedListAdapter;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.base.RecyclerFragment;
import org.sufficientlysecure.keychain.util.FabContainer;

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
View file

@ -44,6 +44,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.Log;

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
View file

@ -47,6 +47,7 @@ import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.ContactHelper;
import org.sufficientlysecure.keychain.util.Log;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View file

@ -49,7 +49,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Notify;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java
View file

@ -42,7 +42,7 @@ import org.sufficientlysecure.keychain.linked.UriAttribute;
import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
import org.sufficientlysecure.keychain.ui.linked.LinkedIdViewFragment;
import org.sufficientlysecure.keychain.ui.keyview.LinkedIdViewFragment;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java
View file

@ -56,7 +56,7 @@ import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity;
import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.dialog.FidesmoInstallDialog;
import org.sufficientlysecure.keychain.ui.dialog.FidesmoPgpInstallDialog;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/LinkedIdViewFragment.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.linked;
package org.sufficientlysecure.keychain.ui.keyview;
import java.io.IOException;
import java.util.Collections;
@ -35,6 +35,7 @@ import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.view.LayoutInflater;
@ -65,7 +66,7 @@ import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyActio
import org.sufficientlysecure.keychain.ui.adapter.LinkedIdsAdapter;
import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment;
import org.sufficientlysecure.keychain.ui.linked.LinkedIdViewFragment.ViewHolder.VerifyState;
import org.sufficientlysecure.keychain.ui.keyview.LinkedIdViewFragment.ViewHolder.VerifyState;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
import org.sufficientlysecure.keychain.ui.util.Notify;
@ -410,10 +411,10 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
root.setTag(mViewHolder);
((ImageView) root.findViewById(R.id.status_icon_verified))
.setColorFilter(mContext.getResources().getColor(R.color.android_green_light),
.setColorFilter(ContextCompat.getColor(mContext, R.color.android_green_light),
PorterDuff.Mode.SRC_IN);
((ImageView) root.findViewById(R.id.status_icon_invalid))
.setColorFilter(mContext.getResources().getColor(R.color.android_red_light),
.setColorFilter(ContextCompat.getColor(mContext, R.color.android_red_light),
PorterDuff.Mode.SRC_IN);
mViewHolder.vButtonVerify.setOnClickListener(new OnClickListener() {

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui;
package org.sufficientlysecure.keychain.ui.keyview;
import java.io.IOException;
@ -84,6 +84,21 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.ChangeUnlockParcel;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.BackupActivity;
import org.sufficientlysecure.keychain.ui.CertifyFingerprintActivity;
import org.sufficientlysecure.keychain.ui.CertifyKeyActivity;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity;
import org.sufficientlysecure.keychain.ui.DeleteKeyDialogActivity;
import org.sufficientlysecure.keychain.ui.EncryptFilesActivity;
import org.sufficientlysecure.keychain.ui.EncryptTextActivity;
import org.sufficientlysecure.keychain.ui.ImportKeysProxyActivity;
import org.sufficientlysecure.keychain.ui.MainActivity;
import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
import org.sufficientlysecure.keychain.ui.QrCodeViewActivity;
import org.sufficientlysecure.keychain.ui.SafeSlingerActivity;
import org.sufficientlysecure.keychain.ui.ViewKeyAdvActivity;
import org.sufficientlysecure.keychain.ui.ViewKeyKeybaseFragment;
import org.sufficientlysecure.keychain.ui.ViewKeySecurityTokenFragment;
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyFragment.java
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui;
package org.sufficientlysecure.keychain.ui.keyview;
import android.content.Intent;
@ -41,16 +41,17 @@ import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.ui.EditIdentitiesActivity;
import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
import org.sufficientlysecure.keychain.ui.base.LoaderFragment;
import org.sufficientlysecure.keychain.ui.dialog.UserIdInfoDialogFragment;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthCardView;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter;
import org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesCardView;
import org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesPresenter;
import org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesPresenter.LinkedIdsFragMvpView;
import org.sufficientlysecure.keychain.ui.widget.SystemContactCardView;
import org.sufficientlysecure.keychain.ui.widget.SystemContactPresenter;
import org.sufficientlysecure.keychain.ui.keyview.view.KeyHealthCardView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.KeyHealthPresenter;
import org.sufficientlysecure.keychain.ui.keyview.view.LinkedIdentitiesCardView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.LinkedIdentitiesPresenter;
import org.sufficientlysecure.keychain.ui.keyview.presenter.LinkedIdentitiesPresenter.LinkedIdsFragMvpView;
import org.sufficientlysecure.keychain.ui.keyview.view.SystemContactCardView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.SystemContactPresenter;
import org.sufficientlysecure.keychain.util.Preferences;

31
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SubkeyStatusLoader.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/SubkeyStatusLoader.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.loader;
import java.util.ArrayList;
@ -36,10 +36,10 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants;
import org.sufficientlysecure.keychain.pgp.SecurityProblem.KeySecurityProblem;
import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
import org.sufficientlysecure.keychain.ui.widget.SubkeyStatusLoader.KeySubkeyStatus;
import org.sufficientlysecure.keychain.ui.keyview.loader.SubkeyStatusLoader.KeySubkeyStatus;
class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
public class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
public static final String[] PROJECTION = new String[] {
Keys.KEY_ID,
Keys.CREATION,
@ -73,7 +73,8 @@ class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
private KeySubkeyStatus cachedResult;
SubkeyStatusLoader(Context context, ContentResolver contentResolver, long masterKeyId, Comparator<SubKeyItem> comparator) {
public SubkeyStatusLoader(Context context, ContentResolver contentResolver, long masterKeyId,
Comparator<SubKeyItem> comparator) {
super(context);
this.contentResolver = contentResolver;
@ -141,11 +142,11 @@ class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
}
}
static class KeySubkeyStatus {
public static class KeySubkeyStatus {
@NonNull
final SubKeyItem keyCertify;
final List<SubKeyItem> keysSign;
final List<SubKeyItem> keysEncrypt;
public final SubKeyItem keyCertify;
public final List<SubKeyItem> keysSign;
public final List<SubKeyItem> keysEncrypt;
KeySubkeyStatus(@NonNull SubKeyItem keyCertify, List<SubKeyItem> keysSign, List<SubKeyItem> keysEncrypt) {
this.keyCertify = keyCertify;
@ -154,15 +155,15 @@ class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
}
}
static class SubKeyItem {
public static class SubKeyItem {
final int mPosition;
final long mKeyId;
final Date mCreation;
final SecretKeyType mSecretKeyType;
final boolean mIsRevoked, mIsExpired;
final Date mExpiry;
public final SecretKeyType mSecretKeyType;
public final boolean mIsRevoked, mIsExpired;
public final Date mExpiry;
final boolean mCanCertify, mCanSign, mCanEncrypt;
final KeySecurityProblem mSecurityProblem;
public final KeySecurityProblem mSecurityProblem;
SubKeyItem(long masterKeyId, Cursor cursor) {
mPosition = cursor.getPosition();
@ -188,11 +189,11 @@ class SubkeyStatusLoader extends AsyncTaskLoader<KeySubkeyStatus> {
masterKeyId, mKeyId, algorithm, bitStrength, curveOid);
}
boolean newerThan(SubKeyItem other) {
public boolean newerThan(SubKeyItem other) {
return mCreation.after(other.mCreation);
}
boolean isValid() {
public boolean isValid() {
return !mIsRevoked && !mIsExpired;
}
}

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SystemContactInfoLoader.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/SystemContactInfoLoader.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.loader;
import java.util.List;
@ -30,11 +30,11 @@ import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.ui.widget.SystemContactInfoLoader.SystemContactInfo;
import org.sufficientlysecure.keychain.ui.keyview.loader.SystemContactInfoLoader.SystemContactInfo;
import org.sufficientlysecure.keychain.util.ContactHelper;
class SystemContactInfoLoader extends AsyncTaskLoader<SystemContactInfo> {
public class SystemContactInfoLoader extends AsyncTaskLoader<SystemContactInfo> {
private static final String[] PROJECTION = {
ContactsContract.RawContacts.CONTACT_ID
};
@ -49,7 +49,7 @@ class SystemContactInfoLoader extends AsyncTaskLoader<SystemContactInfo> {
private SystemContactInfo cachedResult;
SystemContactInfoLoader(Context context, ContentResolver contentResolver, long masterKeyId, boolean isSecret) {
public SystemContactInfoLoader(Context context, ContentResolver contentResolver, long masterKeyId, boolean isSecret) {
super(context);
this.contentResolver = contentResolver;
@ -135,11 +135,11 @@ class SystemContactInfoLoader extends AsyncTaskLoader<SystemContactInfo> {
}
}
static class SystemContactInfo {
public static class SystemContactInfo {
final long masterKeyId;
final long contactId;
final String contactName;
final Bitmap contactPicture;
public final long contactId;
public final String contactName;
public final Bitmap contactPicture;
SystemContactInfo(long masterKeyId, long contactId, String contactName, Bitmap contactPicture) {
this.masterKeyId = masterKeyId;

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.presenter;
import java.util.Comparator;
@ -29,13 +29,14 @@ import android.support.v4.content.Loader;
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
import org.sufficientlysecure.keychain.pgp.SecurityProblem.KeySecurityProblem;
import org.sufficientlysecure.keychain.ui.widget.KeyStatusList.KeyDisplayStatus;
import org.sufficientlysecure.keychain.ui.widget.SubkeyStatusLoader.KeySubkeyStatus;
import org.sufficientlysecure.keychain.ui.widget.SubkeyStatusLoader.SubKeyItem;
import org.sufficientlysecure.keychain.ui.keyview.view.KeyStatusList.KeyDisplayStatus;
import org.sufficientlysecure.keychain.ui.keyview.loader.SubkeyStatusLoader;
import org.sufficientlysecure.keychain.ui.keyview.loader.SubkeyStatusLoader.KeySubkeyStatus;
import org.sufficientlysecure.keychain.ui.keyview.loader.SubkeyStatusLoader.SubKeyItem;
public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
static final Comparator<SubKeyItem> SUBKEY_COMPARATOR = new Comparator<SubKeyItem>() {
private static final Comparator<SubKeyItem> SUBKEY_COMPARATOR = new Comparator<SubKeyItem>() {
@Override
public int compare(SubKeyItem one, SubKeyItem two) {
// if one is valid and the other isn't, the valid one always comes first
@ -251,11 +252,11 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
return KeyDisplayStatus.OK;
}
enum KeyHealthStatus {
public enum KeyHealthStatus {
OK, DIVERT, REVOKED, EXPIRED, INSECURE, SIGN_ONLY, STRIPPED, PARTIAL_STRIPPED, BROKEN
}
interface KeyHealthMvpView {
public interface KeyHealthMvpView {
void setKeyStatus(KeyHealthStatus keyHealthStatus);
void setPrimarySecurityProblem(KeySecurityProblem securityProblem);
void setPrimaryExpiryDate(Date expiry);
@ -269,13 +270,13 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
}
interface KeyStatusMvpView {
public interface KeyStatusMvpView {
void setCertifyStatus(KeyDisplayStatus unavailable);
void setSignStatus(KeyDisplayStatus signStatus);
void setDecryptStatus(KeyDisplayStatus encryptStatus);
}
interface KeyHealthClickListener {
public interface KeyHealthClickListener {
void onKeyHealthClick();
}
}

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/LinkedIdentitiesPresenter.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/LinkedIdentitiesPresenter.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.presenter;
import java.io.IOException;
@ -32,7 +32,7 @@ import android.support.v4.content.Loader;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.ui.adapter.LinkedIdsAdapter;
import org.sufficientlysecure.keychain.ui.linked.LinkedIdViewFragment;
import org.sufficientlysecure.keychain.ui.keyview.LinkedIdViewFragment;
import org.sufficientlysecure.keychain.ui.linked.LinkedIdWizard;
import org.sufficientlysecure.keychain.util.Log;
@ -114,7 +114,7 @@ public class LinkedIdentitiesPresenter implements LoaderCallbacks<Cursor> {
fragView.switchToFragment(frag, "linked_id");
}
interface LinkedIdsMvpView {
public interface LinkedIdsMvpView {
void setSystemContactClickListener(LinkedIdsClickListener linkedIdsClickListener);
void setLinkedIdsAdapter(LinkedIdsAdapter linkedIdsAdapter);
@ -126,7 +126,7 @@ public class LinkedIdentitiesPresenter implements LoaderCallbacks<Cursor> {
void switchToFragment(Fragment frag, String backStackName);
}
interface LinkedIdsClickListener {
public interface LinkedIdsClickListener {
void onLinkedIdItemClick(int position);
void onClickAddIdentity();
}

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SystemContactPresenter.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/SystemContactPresenter.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.presenter;
import android.Manifest;
@ -32,7 +32,8 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.content.Loader;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.ui.widget.SystemContactInfoLoader.SystemContactInfo;
import org.sufficientlysecure.keychain.ui.keyview.loader.SystemContactInfoLoader;
import org.sufficientlysecure.keychain.ui.keyview.loader.SystemContactInfoLoader.SystemContactInfo;
import org.sufficientlysecure.keychain.util.Log;
@ -102,14 +103,14 @@ public class SystemContactPresenter implements LoaderCallbacks<SystemContactInfo
launchAndroidContactActivity(contactId, context);
}
interface SystemContactMvpView {
public interface SystemContactMvpView {
void setSystemContactClickListener(SystemContactClickListener systemContactClickListener);
void showLinkedSystemContact(String contactName, Bitmap picture);
void hideLinkedSystemContact();
}
interface SystemContactClickListener {
public interface SystemContactClickListener {
void onSystemContactClick();
}

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyHealthCardView.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.view;
import java.util.Date;
@ -39,11 +39,11 @@ import org.sufficientlysecure.keychain.pgp.SecurityProblem.InsecureBitStrength;
import org.sufficientlysecure.keychain.pgp.SecurityProblem.KeySecurityProblem;
import org.sufficientlysecure.keychain.pgp.SecurityProblem.NotWhitelistedCurve;
import org.sufficientlysecure.keychain.pgp.SecurityProblem.UnidentifiedKeyProblem;
import org.sufficientlysecure.keychain.ui.keyview.presenter.KeyHealthPresenter.KeyHealthClickListener;
import org.sufficientlysecure.keychain.ui.keyview.presenter.KeyHealthPresenter.KeyHealthMvpView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.KeyHealthPresenter.KeyHealthStatus;
import org.sufficientlysecure.keychain.ui.keyview.view.KeyStatusList.KeyDisplayStatus;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyHealthClickListener;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyHealthMvpView;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyHealthStatus;
import org.sufficientlysecure.keychain.ui.widget.KeyStatusList.KeyDisplayStatus;
public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnClickListener {

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyStatusList.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyStatusList.java
View file

@ -15,12 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.view;
import android.content.Context;
import android.support.annotation.ColorRes;
import android.support.annotation.StringRes;
import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@ -29,7 +30,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyStatusMvpView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.KeyHealthPresenter.KeyStatusMvpView;
public class KeyStatusList extends LinearLayout implements KeyStatusMvpView {
@ -64,7 +65,7 @@ public class KeyStatusList extends LinearLayout implements KeyStatusMvpView {
}
// this is just a list of statuses a key can be in, which we can also display
enum KeyDisplayStatus {
public enum KeyDisplayStatus {
OK (R.color.android_green_light, R.color.primary,
R.string.cap_cert_ok, R.string.cap_sign_ok, R.string.cap_decrypt_ok, false),
DIVERT (R.color.android_green_light, R.color.primary,
@ -113,9 +114,9 @@ public class KeyStatusList extends LinearLayout implements KeyStatusMvpView {
return;
}
vCertIcon.setColorFilter(getResources().getColor(keyDisplayStatus.mColor));
vCertIcon.setColorFilter(ContextCompat.getColor(getContext(), keyDisplayStatus.mColor));
vCertText.setText(keyDisplayStatus.mCertifyStr);
vCertText.setTextColor(getResources().getColor(keyDisplayStatus.mTextColor));
vCertText.setTextColor(ContextCompat.getColor(getContext(), keyDisplayStatus.mTextColor));
vCertToken.setVisibility(keyDisplayStatus.mIsDivert ? View.VISIBLE : View.GONE);
vCertifyLayout.setVisibility(View.VISIBLE);
}
@ -126,9 +127,9 @@ public class KeyStatusList extends LinearLayout implements KeyStatusMvpView {
vSignLayout.setVisibility(View.GONE);
return;
}
vSignIcon.setColorFilter(getResources().getColor(keyDisplayStatus.mColor));
vSignIcon.setColorFilter(ContextCompat.getColor(getContext(), keyDisplayStatus.mColor));
vSignText.setText(keyDisplayStatus.mSignStr);
vSignText.setTextColor(getResources().getColor(keyDisplayStatus.mTextColor));
vSignText.setTextColor(ContextCompat.getColor(getContext(), keyDisplayStatus.mTextColor));
vSignToken.setVisibility(keyDisplayStatus.mIsDivert ? View.VISIBLE : View.GONE);
vSignLayout.setVisibility(View.VISIBLE);
}
@ -139,9 +140,9 @@ public class KeyStatusList extends LinearLayout implements KeyStatusMvpView {
vDecryptLayout.setVisibility(View.GONE);
return;
}
vDecryptIcon.setColorFilter(getResources().getColor(keyDisplayStatus.mColor));
vDecryptIcon.setColorFilter(ContextCompat.getColor(getContext(), keyDisplayStatus.mColor));
vDecryptText.setText(keyDisplayStatus.mDecryptStr);
vDecryptText.setTextColor(getResources().getColor(keyDisplayStatus.mTextColor));
vDecryptText.setTextColor(ContextCompat.getColor(getContext(), keyDisplayStatus.mTextColor));
vDecryptToken.setVisibility(keyDisplayStatus.mIsDivert ? View.VISIBLE : View.GONE);
vDecryptLayout.setVisibility(View.VISIBLE);
}

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/LinkedIdentitiesCardView.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/LinkedIdentitiesCardView.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.view;
import android.content.Context;
@ -31,8 +31,8 @@ import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.adapter.LinkedIdsAdapter;
import org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesPresenter.LinkedIdsClickListener;
import org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesPresenter.LinkedIdsMvpView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.LinkedIdentitiesPresenter.LinkedIdsClickListener;
import org.sufficientlysecure.keychain.ui.keyview.presenter.LinkedIdentitiesPresenter.LinkedIdsMvpView;
public class LinkedIdentitiesCardView extends CardView implements LinkedIdsMvpView {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SystemContactCardView.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/SystemContactCardView.java
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
package org.sufficientlysecure.keychain.ui.keyview.view;
import android.content.Context;
@ -30,8 +30,8 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.widget.SystemContactPresenter.SystemContactClickListener;
import org.sufficientlysecure.keychain.ui.widget.SystemContactPresenter.SystemContactMvpView;
import org.sufficientlysecure.keychain.ui.keyview.presenter.SystemContactPresenter.SystemContactClickListener;
import org.sufficientlysecure.keychain.ui.keyview.presenter.SystemContactPresenter.SystemContactMvpView;
public class SystemContactCardView extends CardView implements SystemContactMvpView, OnClickListener {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java
View file

@ -73,7 +73,7 @@ import org.sufficientlysecure.keychain.operations.results.EditKeyResult;
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.Notify.Style;

2
OpenKeychain/src/main/res/layout/key_health_card_content.xml
View file

@ -147,7 +147,7 @@
/>
</LinearLayout>
<org.sufficientlysecure.keychain.ui.widget.KeyStatusList
<org.sufficientlysecure.keychain.ui.keyview.view.KeyStatusList
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/key_health_status_list"

6
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View file

@ -9,7 +9,7 @@
android:paddingRight="16dp"
android:paddingTop="16dp">
<org.sufficientlysecure.keychain.ui.widget.KeyHealthCardView
<org.sufficientlysecure.keychain.ui.keyview.view.KeyHealthCardView
android:id="@+id/subkey_status_card"
android:layout_gravity="center"
android:layout_width="match_parent"
@ -22,7 +22,7 @@
card_view:cardCornerRadius="4dp"
/>
<org.sufficientlysecure.keychain.ui.widget.LinkedIdentitiesCardView
<org.sufficientlysecure.keychain.ui.keyview.view.LinkedIdentitiesCardView
android:id="@+id/card_linked_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -94,7 +94,7 @@
</android.support.v7.widget.CardView>
<org.sufficientlysecure.keychain.ui.widget.SystemContactCardView
<org.sufficientlysecure.keychain.ui.keyview.view.SystemContactCardView
android:id="@+id/linked_system_contact_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"