From e66794969e79e6d9b0c310dd00a7b4a30da2ddf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 7 Jul 2015 22:15:15 +0200 Subject: Package cert not sig --- .../sufficientlysecure/keychain/provider/ProviderHelper.java | 4 ++-- .../org/sufficientlysecure/keychain/remote/AppSettings.java | 12 ++++++------ .../keychain/remote/ui/AppSettingsActivity.java | 12 ++++++------ .../keychain/remote/ui/AppSettingsHeaderFragment.java | 8 ++++---- .../ui/dialog/AdvancedAppSettingsDialogFragment.java | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 0975712f2..ed17de4ab 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -1422,7 +1422,7 @@ public class ProviderHelper { private ContentValues contentValueForApiApps(AppSettings appSettings) { ContentValues values = new ContentValues(); values.put(ApiApps.PACKAGE_NAME, appSettings.getPackageName()); - values.put(ApiApps.PACKAGE_CERTIFICATE, appSettings.getPackageSignature()); + values.put(ApiApps.PACKAGE_CERTIFICATE, appSettings.getPackageCertificate()); return values; } @@ -1468,7 +1468,7 @@ public class ProviderHelper { settings = new AppSettings(); settings.setPackageName(cursor.getString( cursor.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME))); - settings.setPackageSignature(cursor.getBlob( + settings.setPackageCertificate(cursor.getBlob( cursor.getColumnIndex(KeychainContract.ApiApps.PACKAGE_CERTIFICATE))); } } finally { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java index a3f9f84c9..498601769 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java @@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.remote; public class AppSettings { private String mPackageName; - private byte[] mPackageSignature; + private byte[] mPackageCertificate; public AppSettings() { @@ -28,7 +28,7 @@ public class AppSettings { public AppSettings(String packageName, byte[] packageSignature) { super(); this.mPackageName = packageName; - this.mPackageSignature = packageSignature; + this.mPackageCertificate = packageSignature; } public String getPackageName() { @@ -39,12 +39,12 @@ public class AppSettings { this.mPackageName = packageName; } - public byte[] getPackageSignature() { - return mPackageSignature; + public byte[] getPackageCertificate() { + return mPackageCertificate; } - public void setPackageSignature(byte[] packageSignature) { - this.mPackageSignature = packageSignature; + public void setPackageCertificate(byte[] packageCertificate) { + this.mPackageCertificate = packageCertificate; } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java index d25249b14..4eee73e01 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java @@ -75,7 +75,7 @@ public class AppSettingsActivity extends BaseActivity { mAppNameView = (TextView) findViewById(R.id.api_app_settings_app_name); mAppIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon); mPackageName = (TextView) findViewById(R.id.api_app_settings_package_name); - mPackageSignature = (TextView) findViewById(R.id.api_app_settings_package_signature); + mPackageSignature = (TextView) findViewById(R.id.api_app_settings_package_certificate); mStartFab = (FloatingActionButton) findViewById(R.id.fab); mStartFab.setOnClickListener(new View.OnClickListener() { @@ -148,19 +148,19 @@ public class AppSettingsActivity extends BaseActivity { } private void showAdvancedInfo() { - String signature = null; - // advanced info: package signature SHA-256 + String certificate = null; + // advanced info: package certificate SHA-256 try { MessageDigest md = MessageDigest.getInstance("SHA-256"); - md.update(mAppSettings.getPackageSignature()); + md.update(mAppSettings.getPackageCertificate()); byte[] digest = md.digest(); - signature = new String(Hex.encode(digest)); + certificate = new String(Hex.encode(digest)); } catch (NoSuchAlgorithmException e) { Log.e(Constants.TAG, "Should not happen!", e); } AdvancedAppSettingsDialogFragment dialogFragment = - AdvancedAppSettingsDialogFragment.newInstance(mAppSettings.getPackageName(), signature); + AdvancedAppSettingsDialogFragment.newInstance(mAppSettings.getPackageName(), certificate); dialogFragment.show(getSupportFragmentManager(), "advancedDialog"); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java index 7beac8973..9160987ab 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java @@ -47,7 +47,7 @@ public class AppSettingsHeaderFragment extends Fragment { private TextView mAppNameView; private ImageView mAppIconView; private TextView mPackageName; - private TextView mPackageSignature; + private TextView mPackageCertificate; public AppSettings getAppSettings() { return mAppSettings; @@ -67,7 +67,7 @@ public class AppSettingsHeaderFragment extends Fragment { mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name); mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon); mPackageName = (TextView) view.findViewById(R.id.api_app_settings_package_name); - mPackageSignature = (TextView) view.findViewById(R.id.api_app_settings_package_signature); + mPackageCertificate = (TextView) view.findViewById(R.id.api_app_settings_package_certificate); return view; } @@ -94,11 +94,11 @@ public class AppSettingsHeaderFragment extends Fragment { // advanced info: package signature SHA-256 try { MessageDigest md = MessageDigest.getInstance("SHA-256"); - md.update(appSettings.getPackageSignature()); + md.update(appSettings.getPackageCertificate()); byte[] digest = md.digest(); String signature = new String(Hex.encode(digest)); - mPackageSignature.setText(signature); + mPackageCertificate.setText(signature); } catch (NoSuchAlgorithmException e) { Log.e(Constants.TAG, "Should not happen!", e); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AdvancedAppSettingsDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AdvancedAppSettingsDialogFragment.java index d2fa37cf7..d96879119 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AdvancedAppSettingsDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AdvancedAppSettingsDialogFragment.java @@ -27,7 +27,7 @@ import org.sufficientlysecure.keychain.R; public class AdvancedAppSettingsDialogFragment extends DialogFragment { private static final String ARG_PACKAGE_NAME = "package_name"; - private static final String ARG_SIGNATURE = "signature"; + private static final String ARG_CERTIFICATE = "certificate"; /** * Creates new instance of this fragment @@ -36,7 +36,7 @@ public class AdvancedAppSettingsDialogFragment extends DialogFragment { AdvancedAppSettingsDialogFragment frag = new AdvancedAppSettingsDialogFragment(); Bundle args = new Bundle(); args.putString(ARG_PACKAGE_NAME, packageName); - args.putString(ARG_SIGNATURE, digest); + args.putString(ARG_CERTIFICATE, digest); frag.setArguments(args); return frag; @@ -62,10 +62,10 @@ public class AdvancedAppSettingsDialogFragment extends DialogFragment { }); String packageName = getArguments().getString(ARG_PACKAGE_NAME); - String signature = getArguments().getString(ARG_SIGNATURE); + String certificate = getArguments().getString(ARG_CERTIFICATE); alert.setMessage(getString(R.string.api_settings_package_name) + ": " + packageName + "\n\n" - + getString(R.string.api_settings_package_signature) + ": " + signature); + + getString(R.string.api_settings_package_certificate) + ": " + certificate); return alert.show(); } -- cgit v1.2.3