diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java index f1a57461f..7541158ba 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java @@ -83,13 +83,21 @@ public abstract class CanonicalizedKeyRing extends KeyRing { return getRing().getPublicKey().isRevoked(); } + public Date getCreationDate() { + return getPublicKey().getCreationTime(); + } + + public Date getExpirationDate() { + return getPublicKey().getExpiryTime(); + } + public boolean isExpired() { // Is the master key expired? - Date creationDate = getPublicKey().getCreationTime(); - Date expiryDate = getPublicKey().getExpiryTime(); + Date creationDate = getCreationDate(); + Date expirationDate = getExpirationDate(); Date now = new Date(); - return creationDate.after(now) || (expiryDate != null && expiryDate.before(now)); + return creationDate.after(now) || (expirationDate != null && expirationDate.before(now)); } public boolean canCertify() throws PgpKeyNotFoundException { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 7e2047055..5b0c50fb4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -236,6 +236,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter realUserIdsPlusKeybase = keyRing.getUnorderedUserIds(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java index a47230596..7f47cffe6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java @@ -1,7 +1,9 @@ package org.sufficientlysecure.keychain.ui.bindings; import android.content.Context; +import android.content.res.Resources; import android.databinding.BindingAdapter; +import android.text.format.DateFormat; import android.view.LayoutInflater; import android.widget.LinearLayout; import android.widget.TextView; @@ -12,17 +14,36 @@ import org.sufficientlysecure.keychain.ui.util.Highlighter; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import java.util.ArrayList; +import java.util.Date; import java.util.HashSet; import java.util.Map; public class ImportKeysExtraBindings { + @BindingAdapter({"app:keyCreation"}) + public static void setCreation(TextView textView, Date creationDate) { + Context context = textView.getContext(); + String text; + if (creationDate != null) { + text = DateFormat.getDateFormat(context).format(creationDate); + } else { + Resources resources = context.getResources(); + text = resources.getString(R.string.unknown); + } + textView.setText(text); + } + @BindingAdapter({"app:keyId"}) public static void setKeyId(TextView textView, String keyId) { - if (keyId == null) - keyId = ""; - - textView.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(keyId)); + Context context = textView.getContext(); + String text; + if (keyId != null){ + text = KeyFormattingUtils.beautifyKeyId(keyId); + } else { + Resources resources = context.getResources(); + text = resources.getString(R.string.unknown); + } + textView.setText(text); } @BindingAdapter({"app:keyUserIds", "app:query"}) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 5953f525d..e4dc8639b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -99,7 +99,7 @@ public class KeyFormattingUtils { default: { if (context != null) { - algorithmStr = context.getResources().getString(R.string.unknown_algorithm); + algorithmStr = context.getResources().getString(R.string.unknown); } else { algorithmStr = "unknown"; } @@ -154,7 +154,7 @@ public class KeyFormattingUtils { default: { if (context != null) { - algorithmStr = context.getResources().getString(R.string.unknown_algorithm); + algorithmStr = context.getResources().getString(R.string.unknown); } else { algorithmStr = "unknown"; } @@ -189,7 +189,7 @@ public class KeyFormattingUtils { */ } if (context != null) { - return context.getResources().getString(R.string.unknown_algorithm); + return context.getResources().getString(R.string.unknown); } else { return "unknown"; } @@ -208,7 +208,7 @@ public class KeyFormattingUtils { return name; } if (context != null) { - return context.getResources().getString(R.string.unknown_algorithm); + return context.getResources().getString(R.string.unknown); } else { return "unknown"; } diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml index e06311683..54db43828 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml @@ -12,25 +12,30 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_height="wrap_content"> + + + + + + - - + android:layout_height="wrap_content"> + + + + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 78903caa2..eb07e2808 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -909,7 +909,7 @@ nedostupný Vaše vlastní klíče lze mazat pouze jednotlivě! Zobrazit detaily certifikátu - neznámý + neznámý nelze podepsat Není dostupný šifrovací podklíč! Zobrazit klíč (%s) diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index be902ceba..cd7c483d5 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -1384,7 +1384,7 @@ nicht verfügbar Deine eigenen Schlüssel können nur einzeln gelöscht werden! Beglaubigungsdetails anzeigen - unbekannt + unbekannt kann nicht signieren Kein Verschlüsselungs-Unterschlüssel verfügbar! Schlüssel anzeigen (%s) diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index dbea7dd03..bccad880a 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -1266,7 +1266,7 @@ no disponible ¡Sus claves propias sólo pueden ser borradas individualmente! Ver detalles del certificado - desconocido + desconocido no puede firmarse ¡No hay subclave de cifrado disponible! Mostrar clave (%s) diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index 9965df050..46a2dea97 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -1281,7 +1281,7 @@ eskuraezina Zure jabetzako giltzak banaka bakarrik ezabatu daitezke! Ikusi Egiaztagiriaren Xehetasunak - ezezaguna + ezezaguna ezin da sinatu Ez dago enkriptaketa azpigiltzarik eskuragarri! Erakutsi (%s) giltza diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml index 7a1ee8257..7e2a3a6b8 100644 --- a/OpenKeychain/src/main/res/values-fi/strings.xml +++ b/OpenKeychain/src/main/res/values-fi/strings.xml @@ -253,7 +253,7 @@ Tyyppi ei salasanaa ei saatavilla - tunnistamaton + tunnistamaton Näytä avain (%s) Avain: diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 6d507f9ff..caccf0933 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -1384,7 +1384,7 @@ non disponible Vos propres clefs ne peuvent être supprimées qu\'individuellement ! Voir les détails du certificat - inconnu + inconnu impossible de signer Aucune sous-clef de chiffrement n\'est proposée ! Montrer la clef (%s) diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 49eea3a94..681b21a22 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -1009,7 +1009,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars non disponibile Le vostre chiavi possono essere eliminate solo singolarmente! Visualizza Dettagli Certificati - sconosciuto + sconosciuto non può firmare Nessuna sottochiave di codifica disponibile! Mostra chiave (%s) diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index d5324c2b4..d1201f778 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -1360,7 +1360,7 @@ 存在しない あなたが所有者の鍵は個別にしか削除できません! 証明の詳細を見る - 不明 + 不明 署名不可 暗号化の副鍵がありません! 鍵 (%s) を表示 diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index e0d04a4b4..62820ecc4 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -1161,7 +1161,7 @@ niet beschikbaar Je eigen sleutels kunnen enkel individueel verwijderd worden! Toon Certificaat Details - onbekend + onbekend kan niet ondertekenen Geen codeer-subsleutel beschikbaar! Toon sleutel (%s) diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index e58ba1576..2307ead6c 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -527,7 +527,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw niedostepne Twoje klucze mogą być usuwane tylko pojedynczo! Zweryfikuj szczegóły certyfikatu - nieznany + nieznany nie może podpisać Brak pod-klucza szyfrowania! Pokaż klucz (%s) diff --git a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml index 77e59f710..59513f19b 100644 --- a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml +++ b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml @@ -1384,7 +1384,7 @@ indisponível Suas próprias chaves só podem ser excluídas individualmente! Exibir Detalhes do Certificado - desconhecido + desconhecido não pode assinar Nenhuma sub-chave de encriptação disponível! Exibir chave (%s) diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index f56de4e95..7464f3913 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -1433,7 +1433,7 @@ недоступно Ваши собственные ключи можно удалять только по одному! Просмотреть детали сертификации - неизв. + неизв. не для подписания Нет доп. ключа для шифрования! Показать ключ (%s) diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 943add07f..e0bf8f7af 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -751,7 +751,7 @@ slečen ni na voljo Preglej podrobosti potrdila - neznan + neznan ne more podpisati Ni nobenega podključa za šifriranje! Prikaži ključ (%s) diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 74e9717c9..cd9be6817 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -1389,7 +1389,7 @@ недоступан Сопствене кључеве можете брисати само појединачно! Прикажи детаље сертификата - непознат + непознат не може да потпише Поткључ за шифровање није доступан! Прикажи кључ (%s) diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index aeb9d45c0..46a79a7f2 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -958,7 +958,7 @@ otillgänglig Dina egna nycklar kan bara raderas var för sig! Visa certifikatinformation - okänd + okänd kan inte signera Ingen krypteringsundernyckel tillgänglig! Visa nyckel (%s) diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml index 618f26bbf..dd6d061ee 100644 --- a/OpenKeychain/src/main/res/values-tr/strings.xml +++ b/OpenKeychain/src/main/res/values-tr/strings.xml @@ -395,7 +395,7 @@ mevcut değil Kendi anahtarlarınız yalnızca teker teker silinebilir! Sertifika Ayrıntılarını Görüntüle - bilinmeyen + bilinmeyen imzalanamadı Şifreleme için kullanılabilecek altanahtar mevcut değil! Anahtarı göster (%s) diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index 93bf6ee68..77e3ab701 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -483,7 +483,7 @@ голий Ваші власні ключі можна вилучити лише окремо! Переглянути дані сертифікату - невідомий + невідомий не можна підписати Жодний підключ шифрування недоступний! Показати ключ (%s) diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 0a6e0c7b4..da3d43fa0 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -666,7 +666,7 @@ 無法使用 您的金鑰只能個別地刪除! 查看認證內容 - 未知 + 未知 沒有可供加密的子金鑰! 要發起金鑰交換,先在右邊選擇與會人數,然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題,以確保會議成員與交換的指紋是正確的。 開始交換 diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml index 53826547b..466ad53cd 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -1095,7 +1095,7 @@ 不可用 只能逐个删除您的密钥! 查看认证详情 - 未知 + 未知 无法签署 在开始密钥交换之前,在右侧指定参与者的数量,然后点击“开始交换”按钮。\n\n您将被要求回答两个问题以确认由正确的参与者参与交换过程,并且他们的指纹是正确的。 开始交换 diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2a0665f03..643802778 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -167,9 +167,11 @@ "File compression" "Manage OpenPGP keyservers" "Key ID" + "Key ID:" "Key created %s" "Type" "Creation" + "Creation:" "Expiry" "Usage" "Key Size" @@ -255,7 +257,6 @@ "Cancel" "Don't use Tor" - ]]> ]]> @@ -1512,7 +1513,7 @@ "unavailable" "Your own keys can only be deleted individually!" "View Certificate Details" - "unknown" + "unknown" "cannot sign" "No encryption subkey available!" "Show key (%s)"