From 900e8ce990862534370df84e6dea53716b7b594c Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 12:32:13 +0100 Subject: [PATCH 1/6] Adjust credits --- OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-de/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-el/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-es/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-fr/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-pl/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-ru/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-tr/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-uk/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw-zh/help_about.html | 3 +-- OpenPGP-Keychain/src/main/res/raw/help_about.html | 3 +-- 19 files changed, 19 insertions(+), 38 deletions(-) diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html index 37d4193f7..683c8e859 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html @@ -15,9 +15,8 @@

Entwickler APG 1.x

Bibliotheken

diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html index 95189425d..7281e1007 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html @@ -15,9 +15,8 @@

Desarrolladores de APG 1.x

Librerías

diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html index 3cbbce4d5..7606292ac 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html @@ -15,9 +15,8 @@

Les développeurs d'APG 1.x

Bibliothèques

diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html index ba0676f3e..499e33238 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html @@ -15,9 +15,8 @@

Sviluppatori APG 1.x

Librerie

diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html index 206fc9f8d..206334bcd 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html @@ -15,9 +15,8 @@

APG 1.xの開発者達

ライブラリ

diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html index de16d333f..aff9a6de6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html @@ -15,9 +15,8 @@

Deweloperzy APG 1.x

Biblioteki

diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html index 655e98758..ad1fd62b6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html @@ -15,9 +15,8 @@

Разработчики APG 1.x

Компоненты

diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html index eb262b242..6faa367dd 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html @@ -15,9 +15,8 @@

Geliştiriciler APG 1.x

Kütüphaneler

diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html index c8a5a82c5..f801dd335 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html @@ -15,9 +15,8 @@

Розробники APG 1.x

Бібліотеки

diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html index 863aeee58..58ce75258 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

Libraries

diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html index 23b904995..9038dc3f4 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html @@ -15,9 +15,8 @@

Developers APG 1.x

函式庫

diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html index 51e3f1325..0fa14efc4 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html @@ -19,9 +19,8 @@ And don't add newlines before or after p tags because of transifex -->

Developers APG 1.x

From 60998f114cf45e5ec369e9b7c22b1e3ad2d526cf Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 19:21:45 +0100 Subject: [PATCH 2/6] Adjust encrypt layout, align signature with button --- OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml index 03fe496c6..1dba66cfa 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml @@ -72,7 +72,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp"> + android:paddingLeft="16dp" + android:paddingRight="4dip"> - \ No newline at end of file + From a2048773ee194168594c52c4ea6472b211ef0d5e Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 19:37:41 +0100 Subject: [PATCH 3/6] Fix file decryption interface Actually use mAssumeSymmetricEncryption and set it to false as default. Don't close the file input stream, so we can actually look for PGP encrypted data in the next step. --- .../keychain/ui/DecryptActivity.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 3e389c034..ed9735d8c 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -443,8 +443,7 @@ public class DecryptActivity extends DrawerActivity { getDecryptionKeyFromInputStream(); // if we need a symmetric passphrase or a passphrase to use a secret key ask for it - if (mSecretKeyId == Id.key.symmetric - || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) { + if (mAssumeSymmetricEncryption || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) { showPassphraseDialog(); } else { if (mDecryptTarget == Id.target.file) { @@ -494,6 +493,7 @@ public class DecryptActivity extends DrawerActivity { * TODO: Rework function, remove global variables */ private void getDecryptionKeyFromInputStream() { + mAssumeSymmetricEncryption = false; InputStream inStream = null; if (mContentUri != null) { try { @@ -517,13 +517,6 @@ public class DecryptActivity extends DrawerActivity { Log.e(Constants.TAG, "File not found!", e); AppMsg.makeText(this, getString(R.string.error_file_not_found, e.getMessage()), AppMsg.STYLE_ALERT).show(); - } finally { - try { - if (inStream != null) { - inStream.close(); - } - } catch (Exception e) { - } } } else { inStream = new ByteArrayInputStream(mMessage.getText().toString().getBytes()); @@ -540,7 +533,6 @@ public class DecryptActivity extends DrawerActivity { if (mSecretKeyId == Id.key.none) { throw new PgpGeneralException(getString(R.string.error_no_secret_key_found)); } - mAssumeSymmetricEncryption = false; } catch (NoAsymmetricEncryptionException e) { if (inStream.markSupported()) { inStream.reset(); @@ -553,6 +545,7 @@ public class DecryptActivity extends DrawerActivity { mAssumeSymmetricEncryption = true; } } catch (Exception e) { + Log.e(Constants.TAG, "error while reading decryption key from input stream", e); AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()), AppMsg.STYLE_ALERT).show(); } From 3dfcb037dcf5ae18ab34eb8a42a220d695febfe7 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 12:57:06 +0100 Subject: [PATCH 4/6] Remove icon set credits --- OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-de/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-el/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-es/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-fr/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-ja/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-pl/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-ru/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-tr/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-uk/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw-zh/help_about.html | 2 -- OpenPGP-Keychain/src/main/res/raw/help_about.html | 2 -- 19 files changed, 38 deletions(-) diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html index 683c8e859..4199f9b5e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache Lizenz v2)
  • Android AppMsg Bibliothek (Apache Lizenz v2)
    • -
  • Icons von RRZE Icon Set (Creative Commons Attribution Share-Alike Lizenz 3.0)
    • -
  • Icons von Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html index 7281e1007..64d80ab74 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Licencia Apache v2)
  • Librería Android AppMsg (Licencia Apache v2)
    • -
  • Icons de RRZE Icon Set (Creative Commons Attribution Compartir-Igual licencia 3.0)
    • -
  • Iconos de Tango Icon Set (Dominio Público)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html index 7606292ac..93e5a5df7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Licence Apache v2)
  • Bibliothèque Android AppMsg (Licence Apache v2)
    • -
  • Icônes du jeu d'icônes RRZE (Licence Creative Commons Paternité - Partage des Conditions Initiales à l'Identique 3.0)
    • -
  • Icônes du jeu d'icônes Tango (domaine public)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html index 499e33238..5e4a53ed6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Licenza Apache v2)
  • Android AppMsg Library (Licenza Apache v2)
    • -
  • Icone da RRZE Icon Set (Licenza Creative Commons Attribution Share-Alike 3.0)
    • -
  • Icone da Tango Icon Set (Pubblico Dominio)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html index 206334bcd..72c7616a3 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (パブリックドメイン)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html index aff9a6de6..c07fc503f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Licencja Apache v2)
  • Android AppMsg Library (Licencja Apache v2)
    • -
  • Icons from RRZE Icon Set (Licencja Uznanie autorstwa - Na tych samych warunkach 3.0 CC-BY-SA)
    • -
  • Icons from Tango Icon Set (Domena Publiczna)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html index ad1fd62b6..8379bf8de 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Библиотека Android AppMsg (Apache License v2)
    • -
  • Иконки RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Иконки Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html index 6faa367dd..454d16151 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • İkonlar RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • İkonlar Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html index f801dd335..9526dc0c6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (ліцензія Apache в.2)
  • Бібліотека Android AppMsg Library (Ліцензія Apache в. 2)
    • -
  • Піктограми із набору піктограм RRZE (ліцензія Creative Commons - Із зазначенням авторства - Розповсюдження на тих самих умовах - версія 3.0)
    • -
  • Піктограми із набору піктограм Tango (відкритий домен)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html index 58ce75258..5a8f7bde7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html index 9038dc3f4..6d00fc6a1 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html @@ -37,8 +37,6 @@ HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html index 0fa14efc4..8d7714365 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html @@ -34,8 +34,6 @@ And don't add newlines before or after p tags because of transifex -->
  • SpongyCastle (MIT X11 License)
  • HtmlTextView (Apache License v2)
  • Android AppMsg Library (Apache License v2)
    • -
  • Icons from RRZE Icon Set (Creative Commons Attribution Share-Alike licence 3.0)
    • -
  • Icons from Tango Icon Set (Public Domain)
    • From 9d4582f9689f53589bbf7cc3e224f9fd061f1d51 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 19:52:25 +0100 Subject: [PATCH 5/6] Update README.md, icon set not used anymore --- README.md | 66 ++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 8954bdcda..958a445be 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenKeychain (for Android) -OpenKeychain is an OpenPGP implementation for Android. +OpenKeychain is an OpenPGP implementation for Android. For a more detailed description and installation instructions go to http://www.openkeychain.org . ### Travis CI Build Status @@ -31,9 +31,9 @@ Development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev ### Build with Gradle 1. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html) -2. Open the Android SDK Manager (shell command: ``android``). -Expand the Tools directory and select "Android SDK Build-tools (Version 19.0.3)". -Expand the Extras directory and install "Android Support Repository" +2. Open the Android SDK Manager (shell command: ``android``). +Expand the Tools directory and select "Android SDK Build-tools (Version 19.0.3)". +Expand the Extras directory and install "Android Support Repository" Select everything for the newest SDK (API-Level 19) 3. Export ANDROID_HOME pointing to your Android SDK 4. Execute ``./gradlew build`` @@ -59,11 +59,11 @@ I am using the newest [Android Studio](http://developer.android.com/sdk/installi OpenKeychain provides two APIs, namely the Intent API and the Remote OpenPGP API. The Intent API can be used without permissions to start OpenKeychain's activities for cryptographic operations, import of keys, etc. -However, it always requires user input, so that no malicious application can use this API without user intervention. +However, it always requires user input, so that no malicious application can use this API without user intervention. The Remote OpenPGP API is more sophisticated and allows to to operations without user interaction in the background. When utilizing this API, OpenKeychain asks the user on first use to grant access for the calling client application. -More technical information and examples about these APIs can be found in the project's wiki: +More technical information and examples about these APIs can be found in the project's wiki: * [Intent API](https://github.com/openpgp-keychain/openpgp-keychain/wiki/Intent-API) * [Remote OpenPGP API](https://github.com/openpgp-keychain/openpgp-keychain/wiki/OpenPGP-API) @@ -110,7 +110,7 @@ see ### Gradle Build System -We try to make our builds as [reproducible/deterministic](https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise) as possible. +We try to make our builds as [reproducible/deterministic](https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise) as possible. When changing build files or dependencies, respect the following requirements: * No precompiled libraries. All libraries should be provided as sourcecode in "libraries" folder (you never know what pre-compiled jar files really contain! The library files are currently directly commited, because git submodules/git subtree are too much of a hassle for new contributors. This could change in the future!) * No dependencies from Maven (also a soft requirement for inclusion in [F-Droid](https://f-droid.org)) @@ -180,59 +180,55 @@ Some parts (older parts and some libraries are Apache License v2, MIT X11 Licens > it under the terms of the GNU General Public License as published by > the Free Software Foundation, either version 3 of the License, or > (at your option) any later version. -> +> > This program is distributed in the hope that it will be useful, > but WITHOUT ANY WARRANTY; without even the implied warranty of > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > GNU General Public License for more details. -> +> > You should have received a copy of the GNU General Public License > along with this program. If not, see . ### Libraries -* SpongyCastle - https://github.com/rtyley/spongycastle +* SpongyCastle + https://github.com/rtyley/spongycastle MIT X11 License -* Android Support Library v4 - http://developer.android.com/tools/support-library/index.html - Apache License v2 - -* Android Support Library v7 'appcompat' - http://developer.android.com/tools/support-library/index.html +* Android Support Library v4 + http://developer.android.com/tools/support-library/index.html Apache License v2 -* HtmlTextView - https://github.com/dschuermann/html-textview +* Android Support Library v7 'appcompat' + http://developer.android.com/tools/support-library/index.html Apache License v2 -* ZXing - https://github.com/zxing/zxing +* HtmlTextView + https://github.com/dschuermann/html-textview Apache License v2 - -* StickyListHeaders - https://github.com/emilsjolander/StickyListHeaders + +* ZXing + https://github.com/zxing/zxing Apache License v2 - -* Android-Bootstrap - https://github.com/Bearded-Hen/Android-Bootstrap + +* StickyListHeaders + https://github.com/emilsjolander/StickyListHeaders + Apache License v2 + +* Android-Bootstrap + https://github.com/Bearded-Hen/Android-Bootstrap MIT License -* Android AppMsg - https://github.com/johnkil/Android-AppMsg +* Android AppMsg + https://github.com/johnkil/Android-AppMsg Apache License v2 ### Images -* icon.svg +* icon.svg modified version of kgpg_key2_kopete.svgz -* key.svg - http://rrze-icon-set.berlios.de/ - Creative Commons Attribution Share-Alike licence 3.0 - -* Menu icons +* Menu icons http://developer.android.com/design/downloads/index.html#action-bar-icon-pack From c9053b97a880ffcc7e7f8a58b9150fa546f87db0 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 23 Mar 2014 21:56:18 +0100 Subject: [PATCH 6/6] Rename old mentionings of APG-named things Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs --- .../sufficientlysecure/keychain/helper/ExportHelper.java | 4 ++-- .../keychain/provider/KeychainServiceBlobProvider.java | 2 +- .../keychain/service/KeychainIntentService.java | 2 +- .../keychain/ui/CertifyKeyActivity.java | 8 ++++---- .../sufficientlysecure/keychain/ui/DecryptActivity.java | 4 ++-- .../sufficientlysecure/keychain/ui/EditKeyActivity.java | 8 ++++---- .../sufficientlysecure/keychain/ui/EncryptActivity.java | 4 ++-- .../keychain/ui/ImportKeysActivity.java | 2 +- .../sufficientlysecure/keychain/ui/UploadKeyActivity.java | 4 ++-- .../keychain/ui/dialog/DeleteFileDialogFragment.java | 4 ++-- .../keychain/ui/widget/SectionView.java | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java index 2bfa796c7..cc240a67b 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java @@ -139,7 +139,7 @@ public class ExportHelper { intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after exporting is done in ApgService + // Message is received after exporting is done in KeychainIntentService KeychainIntentServiceHandler exportHandler = new KeychainIntentServiceHandler(mActivity, mActivity.getString(R.string.progress_exporting), ProgressDialog.STYLE_HORIZONTAL, @@ -151,7 +151,7 @@ public class ExportHelper { } }) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java index 6ac61e157..aa30e845d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.UUID; public class KeychainServiceBlobProvider extends ContentProvider { - private static final String STORE_PATH = Constants.Path.APP_DIR + "/ApgBlobs"; + private static final String STORE_PATH = Constants.Path.APP_DIR + "/KeychainBlobs"; private KeychainServiceBlobDatabase mBlobDatabase = null; diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index e26ee3c76..bd3a0421b 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -855,7 +855,7 @@ public class KeychainIntentService extends IntentService if (this.mIsCanceled) { return; } - Log.e(Constants.TAG, "ApgService Exception: ", e); + Log.e(Constants.TAG, "KeychainIntentService Exception: ", e); e.printStackTrace(); Bundle data = new Bundle(); diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index dff4e9d72..5dc06c16d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -327,11 +327,11 @@ public class CertifyKeyActivity extends ActionBarActivity implements intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after signing is done in ApgService + // Message is received after signing is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_signing), ProgressDialog.STYLE_SPINNER) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { @@ -380,11 +380,11 @@ public class CertifyKeyActivity extends ActionBarActivity implements intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after uploading is done in ApgService + // Message is received after uploading is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_exporting), ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index ed9735d8c..9b3b00c19 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -631,11 +631,11 @@ public class DecryptActivity extends DrawerActivity { intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after encrypting is done in ApgService + // Message is received after encrypting is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_decrypting), ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 092a502e1..6eb5b9d2d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -180,7 +180,7 @@ public class EditKeyActivity extends ActionBarActivity { serviceIntent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after generating is done in ApgService + // Message is received after generating is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( this, getResources().getQuantityString(R.plurals.progress_generating, 1), ProgressDialog.STYLE_HORIZONTAL, true, @@ -197,7 +197,7 @@ public class EditKeyActivity extends ActionBarActivity { @Override public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { @@ -540,11 +540,11 @@ public class EditKeyActivity extends ActionBarActivity { intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after saving is done in ApgService + // Message is received after saving is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_saving), ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 4ccfd393f..4f18f69d7 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -597,11 +597,11 @@ public class EncryptActivity extends DrawerActivity { intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after encrypting is done in ApgService + // Message is received after encrypting is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_encrypting), ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 05bfc613e..834509f53 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -363,7 +363,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa * Import keys with mImportData */ public void importKeys() { - // Message is received after importing is done in ApgService + // Message is received after importing is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( this, getString(R.string.progress_importing), diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 2c8f66488..0e231e6a8 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -98,11 +98,11 @@ public class UploadKeyActivity extends ActionBarActivity { intent.putExtra(KeychainIntentService.EXTRA_DATA, data); - // Message is received after uploading is done in ApgService + // Message is received after uploading is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, getString(R.string.progress_exporting), ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java index b067010df..b4c38184c 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java @@ -87,11 +87,11 @@ public class DeleteFileDialogFragment extends DialogFragment { false, null); - // Message is received after deleting is done in ApgService + // Message is received after deleting is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(activity, deletingDialog) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java index e5b6003b1..1ef178f15 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java @@ -256,11 +256,11 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor } }); - // Message is received after generating is done in ApgService + // Message is received after generating is done in KeychainIntentService KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(mActivity, mGeneratingDialog) { public void handleMessage(Message message) { - // handle messages by standard ApgHandler first + // handle messages by standard KeychainIntentServiceHandler first super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {