diff options
22 files changed, 40 insertions, 40 deletions
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(); } diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index 1ea0a520d..20abb3965 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -53,11 +53,11 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/api_settings_package_signature" + android:text="@string/api_settings_package_certificate" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/api_app_settings_package_signature" + android:id="@+id/api_app_settings_package_certificate" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Base64 encoded hash of signature" diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 3107b5fd9..36e75e976 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -389,7 +389,7 @@ <string name="api_settings_start">Spustit aplikaci</string> <string name="api_settings_delete_account">Smazat účet</string> <string name="api_settings_package_name">Jméno balíčku</string> - <string name="api_settings_package_signature">SHA-256 z podpisu balíčku</string> + <string name="api_settings_package_certificate">SHA-256 z podpisu balíčku</string> <string name="api_settings_settings">Nastavení</string> <string name="api_settings_key">Klíč účtu:</string> <string name="api_settings_accounts_empty">Žádné účty nejsou specifikovány pro tuto appku.</string> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index d203abc67..29e5c25bb 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -459,7 +459,7 @@ <string name="api_settings_start">Starte Anwendung</string> <string name="api_settings_delete_account">Benutzerkonto löschen</string> <string name="api_settings_package_name">Paketname</string> - <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string> + <string name="api_settings_package_certificate">SHA-256 der Paketsignatur</string> <string name="api_settings_accounts">Benutzerkonten (veraltete API)</string> <string name="api_settings_advanced">Erweiterte Informationen</string> <string name="api_settings_allowed_keys">Erlaubte Schlüssel</string> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 75a481f8d..0d585dda4 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -497,7 +497,7 @@ <string name="api_settings_start">Iniciar aplicación</string> <string name="api_settings_delete_account">Borrar cuenta</string> <string name="api_settings_package_name">Nombre de paquete</string> - <string name="api_settings_package_signature">SHA-256 de firma de paquete</string> + <string name="api_settings_package_certificate">SHA-256 de firma de paquete</string> <string name="api_settings_accounts">Cuentas (API antigua)</string> <string name="api_settings_advanced">Información extendida</string> <string name="api_settings_allowed_keys">Claves permitidas</string> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index b16e09587..d8f7f4dfd 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -472,7 +472,7 @@ <string name="api_settings_start">Abiarazi aplikazioa</string> <string name="api_settings_delete_account">Ezabatu kontua</string> <string name="api_settings_package_name">Pakete Izena</string> - <string name="api_settings_package_signature">Sinadura Paketearen SHA-256</string> + <string name="api_settings_package_certificate">Sinadura Paketearen SHA-256</string> <string name="api_settings_accounts">Kontuak (API zaharra)</string> <string name="api_settings_advanced">Argibide Hedatuak</string> <string name="api_settings_allowed_keys">Ahalbidetutako Giltzak</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index c0560d260..c6d4dae81 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -471,7 +471,7 @@ <string name="api_settings_start">Lancer l\'application</string> <string name="api_settings_delete_account">Supprimer le compte</string> <string name="api_settings_package_name">Nom du paquet</string> - <string name="api_settings_package_signature">SHA-256 de la signature du paquet</string> + <string name="api_settings_package_certificate">SHA-256 de la signature du paquet</string> <string name="api_settings_accounts">Comptes (ancienne API)</string> <string name="api_settings_advanced">Informations détaillées</string> <string name="api_settings_allowed_keys">Clefs autorisées</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 31a389d32..0b3aa7a0c 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -420,7 +420,7 @@ <string name="api_settings_start">Avvia applicazione</string> <string name="api_settings_delete_account">Cancella account</string> <string name="api_settings_package_name">Nome Pacchetto</string> - <string name="api_settings_package_signature">SHA-256 della Firma del Pacchetto</string> + <string name="api_settings_package_certificate">SHA-256 della Firma del Pacchetto</string> <string name="api_settings_settings">Impostazioni</string> <string name="api_settings_key">Chiave account:</string> <string name="api_settings_accounts_empty">Nessun account collegato a questa applicazione</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 790913684..0f57c5023 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -433,7 +433,7 @@ <string name="api_settings_start">アプリケーションを開始</string> <string name="api_settings_delete_account">アカウントを削除</string> <string name="api_settings_package_name">パッケージ名</string> - <string name="api_settings_package_signature">パッケージの署名 SHA-256</string> + <string name="api_settings_package_certificate">パッケージの署名 SHA-256</string> <string name="api_settings_accounts">アカウント(deprecated API)</string> <string name="api_settings_advanced">詳細情報</string> <string name="api_settings_allowed_keys">受け入れる鍵</string> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index d347226ce..d28a6db93 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -497,7 +497,7 @@ <string name="api_settings_start">Start applicatie</string> <string name="api_settings_delete_account">Verwijder account</string> <string name="api_settings_package_name">Pakketnaam</string> - <string name="api_settings_package_signature">SHA-256 van Pakkethandtekening</string> + <string name="api_settings_package_certificate">SHA-256 van Pakkethandtekening</string> <string name="api_settings_accounts">Accounts (oude API)</string> <string name="api_settings_advanced">Uitgebreide informatie</string> <string name="api_settings_allowed_keys">Toegestane sleutels</string> diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index e42db714f..db15b3e67 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -372,7 +372,7 @@ <string name="api_settings_start">Uruchom aplikację</string> <string name="api_settings_delete_account">Usuń konto</string> <string name="api_settings_package_name">Nazwa paczki</string> - <string name="api_settings_package_signature">Skrót SHA-256 podpisu paczki</string> + <string name="api_settings_package_certificate">Skrót SHA-256 podpisu paczki</string> <string name="api_settings_settings">Ustawienia</string> <string name="api_settings_key">Klucz konta:</string> <string name="api_settings_accounts_empty">Brak kont połączonych z tą aplikacją.</string> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index e5e164c49..c13796795 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -367,7 +367,7 @@ <string name="api_settings_start">Запустить приложение</string> <string name="api_settings_delete_account">Удалить аккаунт</string> <string name="api_settings_package_name">Наименование пакета</string> - <string name="api_settings_package_signature">SHA-256 подписи пакета</string> + <string name="api_settings_package_certificate">SHA-256 подписи пакета</string> <string name="api_settings_accounts">Аккаунты (устаревший API)</string> <string name="api_settings_advanced">Подробная информация</string> <string name="api_settings_allowed_keys">Разрешённые ключи</string> diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 5a133b125..06cba3827 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -436,7 +436,7 @@ <string name="api_settings_start">Zaženi aplikacijo</string> <string name="api_settings_delete_account">Izbriši račun</string> <string name="api_settings_package_name">Ime paketa</string> - <string name="api_settings_package_signature">SHA-256 podpisa paketa</string> + <string name="api_settings_package_certificate">SHA-256 podpisa paketa</string> <string name="api_settings_allowed_keys">Dovoljeni ključi</string> <string name="api_settings_settings">Nastavitve</string> <string name="api_settings_key">Ključ računa:</string> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index ebacebb5f..21b425b1a 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -465,7 +465,7 @@ <string name="api_settings_start">Покрени апликацију</string> <string name="api_settings_delete_account">Обриши налог</string> <string name="api_settings_package_name">Име пакета</string> - <string name="api_settings_package_signature">СХА-256 потписа пакета</string> + <string name="api_settings_package_certificate">СХА-256 потписа пакета</string> <string name="api_settings_accounts">Налози (застарели АПИ)</string> <string name="api_settings_advanced">Напредни подаци</string> <string name="api_settings_allowed_keys">Дозвољени кључеви</string> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index e3633c7c5..fa503ca6e 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -444,7 +444,7 @@ <string name="api_settings_start">Starta app</string> <string name="api_settings_delete_account">Radera konto</string> <string name="api_settings_package_name">Paketnamn</string> - <string name="api_settings_package_signature">SHA-256 för paketsignatur</string> + <string name="api_settings_package_certificate">SHA-256 för paketsignatur</string> <string name="api_settings_accounts">Konton (gamla API:t)</string> <string name="api_settings_advanced">Utökad information</string> <string name="api_settings_allowed_keys">Tillåtna nycklar</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index ffbbca801..40d588bca 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -308,7 +308,7 @@ <string name="api_settings_start">Запустити програму</string> <string name="api_settings_delete_account">Видалити профіль</string> <string name="api_settings_package_name">Назва пакунку</string> - <string name="api_settings_package_signature">SHA-256 підписку пакунку</string> + <string name="api_settings_package_certificate">SHA-256 підписку пакунку</string> <string name="api_settings_settings">Параметри</string> <string name="api_settings_accounts_empty">Немає облікового запису приєднаного до цієї програми.</string> <string name="api_register_allow">Дозволити доступ</string> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 888cfe34c..d7a38f3ba 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -394,7 +394,7 @@ <string name="api_settings_start">開啟應用程式</string> <string name="api_settings_delete_account">移除帳戶</string> <string name="api_settings_package_name">打包名稱</string> - <string name="api_settings_package_signature">SHA-256 所打包的簽章</string> + <string name="api_settings_package_certificate">SHA-256 所打包的簽章</string> <string name="api_settings_accounts">帳戶(舊版API)</string> <string name="api_settings_advanced">延伸資訊</string> <string name="api_settings_allowed_keys">允許的金鑰</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9a275455a..2e6552b0f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -556,7 +556,7 @@ <string name="api_settings_start">"Start application"</string> <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> - <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> + <string name="api_settings_package_certificate">"SHA-256 of Package Certificate"</string> <string name="api_settings_accounts">"Accounts (old API)"</string> <string name="api_settings_advanced">"Extended Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> |