removed black border around icon

.gitignore

@@ -31,3 +31,9 @@ pom.xml.*
 
 #OS Specific
 [Tt]humbs.db
+
+Makefile
+todo.txt
+*sublime*
+patches
+.DS_Store

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "libs/bc"]
+	path = libs/bc
+	url = https://github.com/thialfihar/bc-java-for-apg.git
+[submodule "libs/AndroidBootstrap"]
+	path = libs/AndroidBootstrap
+	url = https://github.com/Bearded-Hen/Android-Bootstrap.git
+[submodule "libs/HtmlTextView"]
+	path = libs/HtmlTextView
+	url = https://github.com/thialfihar/html-textview.git
+[submodule "libs/openpgp-api-lib"]
+	path = libs/openpgp-api-lib
+	url = https://github.com/open-keychain/openpgp-api-lib.git
+[submodule "libs/openkeychain-api-lib"]
+	path = libs/openkeychain-api-lib
+	url = https://github.com/open-keychain/openkeychain-api-lib.git

.travis.yml

@@ -3,14 +3,14 @@ jdk: oraclejdk7
 before_install:
     # Install base Android SDK
     - sudo apt-get update -qq
-    - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs; fi
+    - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm lib32z1 lib32stdc++6; fi
     - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
     - tar xzf android-sdk_r22.3-linux.tgz
     - export ANDROID_HOME=$PWD/android-sdk-linux
     - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
     # Install required Android components.
-    - echo "y" | android update sdk -a --filter build-tools-19.0.3,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
+    - echo "y" | android update sdk -a --filter build-tools-19.0.0,build-tools-19.0.3,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
+    - git submodule update --init --recursive
 install: echo "Installation done"
-script: gradle assemble -S -q
-
+script: gradle assemble -S -q -Dandroid.sdk=$ANDROID_HOME

.tx/config

@@ -2,32 +2,42 @@
 host = https://www.transifex.com
 lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw
 
-[openpgp-keychain.strings]
-file_filter = OpenPGP-Keychain/src/main/res/values-<lang>/strings.xml
-source_file = OpenPGP-Keychain/src/main/res/values/strings.xml
+[apg.strings]
+file_filter = apg/src/main/res/values-<lang>/strings.xml
+source_file = apg/src/main/res/values/strings.xml
 source_lang = en
 
-[openpgp-keychain.help-about]
-file_filter = OpenPGP-Keychain/src/main/res/raw-<lang>/help_about.html
-source_file = OpenPGP-Keychain/src/main/res/raw/help_about.html
+[apg.help-about]
+file_filter = apg/src/main/res/raw-<lang>/help_about.html
+source_file = apg/src/main/res/raw/help_about.html
 source_lang = en
 
-[openpgp-keychain.help-changelog]
-file_filter = OpenPGP-Keychain/src/main/res/raw-<lang>/help_changelog.html
-source_file = OpenPGP-Keychain/src/main/res/raw/help_changelog.html
+[apg.help-changelog]
+file_filter = apg/src/main/res/raw-<lang>/help_changelog.html
+source_file = apg/src/main/res/raw/help_changelog.html
 source_lang = en
 
-[openpgp-keychain.help-nfc-beam]
-file_filter = OpenPGP-Keychain/src/main/res/raw-<lang>/help_nfc_beam.html
-source_file = OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
+[apg.help-wot]
+file_filter = apg/src/main/res/raw-<lang>/help_wot.html
+source_file = apg/src/main/res/raw/help_wot.html
 source_lang = en
 
-[openpgp-keychain.help-start]
-file_filter = OpenPGP-Keychain/src/main/res/raw-<lang>/help_start.html
-source_file = OpenPGP-Keychain/src/main/res/raw/help_start.html
+[apg.help-nfc-beam]
+file_filter = apg/src/main/res/raw-<lang>/help_nfc_beam.html
+source_file = apg/src/main/res/raw/help_nfc_beam.html
 source_lang = en
 
-[openpgp-keychain.nfc-beam-share]
-file_filter = OpenPGP-Keychain/src/main/res/raw-<lang>/nfc_beam_share.html
-source_file = OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
+[apg.help-start]
+file_filter = apg/src/main/res/raw-<lang>/help_start.html
+source_file = apg/src/main/res/raw/help_start.html
+source_lang = en
+
+[apg.nfc-beam-share]
+file_filter = apg/src/main/res/raw-<lang>/nfc_beam_share.html
+source_file = apg/src/main/res/raw/nfc_beam_share.html
+source_lang = en
+
+[apg.help-faq]
+file_filter = apg/src/main/res/raw-<lang>/help_faw.html
+source_file = apg/src/main/res/raw/help_faq.html
 source_lang = en

CHANGELOG

@@ -1,7 +1,9 @@
-2.3.1
+APG v1.1.0
+
+OpenKeychain 2.3.1
 * hotfix for crash when upgrading from old versions
 
-2.3
+OpenKeychain 2.3
 * remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
 * fix setting expiry dates on keys (thanks to Ash Hughes)
 * more internal fixes when editing keys (thanks to Ash Hughes)
@@ -12,7 +14,7 @@
 * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
 * fix upload of key from signing screen
 
-2.2
+OpenKeychain 2.2
 * New design with navigation drawer
 * New public key list design
 * New public key view
@@ -23,32 +25,32 @@
 * Sharing of keys via QR Codes fixed and improved
 * Package signature verification for API
 
-2.1
+OpenKeychain 2.1
 * Lots of bug fixes
 * New API for developers
 * PRNG bug fix by Google
 
-2.0
+OpenKeychain 2.0
 * Complete redesign
 * Share public keys via qr codes, nfc beam
 * Sign keys
 * Upload keys to server
 * Fixes import issues
 * New AIDL API
 
-1.0.8
+APG v1.0.8
 * basic keyserver support (HKP, please report bugs :))
 * app2sd (untested, let me know if there are problems)
 * more choices for pass phrase cache: 1, 2, 4, 8, hours
 * translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
 * bugfixes
 * optimizations
 
-1.0.7
+APG v1.0.7
 * clear sign problem with lacking trailing newline fixed
 * more options for pass phrase cache time to live (20, 40, 60 mins)
 
-1.0.6
+APG v1.0.6
 * account adding crash on Froyo fixed
 * secure file deletion
 * option to delete key file after import
@@ -57,90 +59,90 @@
 * interface changes
 * bugfixes
 
-1.0.5
+APG v1.0.5
 * German and Italian translation
 * much smaller package, due to reduced BC sources
 * new preferences GUI
 * layout adjustment for localization
 * signature bugfix
 
-1.0.4
+APG v1.0.4
 * fixed another crash caused by some SDK bug with query builder
 
-1.0.3
+APG v1.0.3
 * fixed crashes during encryption/signing and possibly key export
 
-1.0.2
+APG v1.0.2
 * filterable key lists
 * smarter preselection of encryption keys
 * new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
 * fixes and additional features (key preselection) for k9, new beta build available
 
-1.0.1
+APG v1.0.1
 * GMail account listing was broken in 1.0.0, fixed again
 
-1.0.0
+APG v1.0.0
 * k9mail integration, APG supporting beta build of k9mail
 * support of more file managers (including ASTRO)
 * Slovenian translation
 * new database, much faster, less memory usage
 * defined Intents and content provider for other apps
 * bugfixes
 
-0.9.7
+APG v0.9.7
 * 0.9.5 must have introduced a bug that prevented symmetric encryption, this release fixes it
 
-0.9.6
+APG v0.9.6
 * finally fixed that bug that prevents the import of keys exported with Enigmail (and others), since this likely affects many users... it gets its own quick release
 
-0.9.5
+APG v0.9.5
 * k9mail integration: using "More -> Forward (alternate)"
 * pass phrase cache
 * compression preferences added
 * accurate decryption progress bar
 * internationalization prepared, hopefully translations will follow
 
-0.9.4
+APG v0.9.4
 * Android 1.5 support, I *hope*, please report problems with layout and graphics
 * yet another interface change, hopefully this will be it :)
 * symmetric encryption for messages
 * encrypt and decrypt processes all wrapped into ONE activity respectively in preparation for defined Intents to use APG in other apps
 
-0.9.3
+APG v0.9.3
 * handle large files correctly
 * better progress bars (especially for file encryption/decryption)
 * option to delete files after en-/decryption
 * bug fixes, layout tweaks
 
-0.9.2
+APG v0.9.2
 * settings for default encryption/hash algorithm
 * hushmail key support
 * GUI improvements (encrypt file layout rewritten)
 * bug fixes
 
-0.9.1
+APG v0.9.1
 * ElGamal support for subkeys
 * fixes of some silly 0.9.0 bugs
 
-0.9.0
+APG v0.9.0
 * OI File Manager support
 * file encryption/decryption
 
-0.8.1
+APG v0.8.1
 * display/verify signed-only mails
 * bug fixes, layout fixes
 
-0.8.0
+APG v0.8.0
 * create/edit keys
 * export keys
 * GUI more Android-like
 * a lot of code review, rewriting things
 * tidy up strings and error handling
 
-0.7.1
+APG v0.7.1
 * minor fixes, some code review
 * recognize ElGamal encryption keys as suitable for encryption
 * allow signing only
 
-0.7.0
-* initial public release
+APG v0.7.0
+* initial public release

DESIGN.mkd

@@ -0,0 +1,54 @@
+# Design Notes on Open-Keychain
+
+This document contains notes on the software design of open keychain. 
+
+
+## Database design
+
+The database has two distinct types of tables:
+- The key\_ring\_{public,secret} tables, which hold binary blobs of all known
+  public and private keys, respectively, and nothing else.
+- All other tables, which cache information about key rings in a consistent
+  manner. This information includes various pieces of metadata about each key's
+  subkeys, user ids, and certificates.
+
+### Constraints
+
+All tables in the database have FOREIGN KEY constraints related to the
+key\_ring\_public table. This is also true for the key\_ring\_secret table,
+which means that secret keys cannot exist in the database without their public
+key counterparts. This has implications in particular on the order of insertion
+for private key rings and their public key ring counterparts into the database,
+even more so when editing a key ring is edited.
+
+### Cache usage considerations
+
+It is of note that extraction of metadata from key rings is in some cases a
+surprisingly expensive operation. As a prime example (heh), properly extracting
+a key's associated primary user id requires examination and possibly
+verification of all self-certificates, which in turn requires examination of
+all certificates.
+
+To ensure consistency, each type of metadata must be extracted one way in
+exactly one routine. For this reason, it is often desirable to make use of
+cached data even when the underlying pgp key ring objects are contextually
+available.
+
+
+## Further work / WIP
+
+### Separation of concerns
+
+Roughly speaking, the crypto code should be strictly separated from the android
+code. At the time of this writing (30.04.14), most of these thoughts are yet to
+be put into practice.
+
+There are three aspects to OK which should be kept largely separate:
+- Firstly, there is Code dealing with pgp and crypto. This code exclusively makes
+  use of the BouncyCastle library. It lives in the .pgp package.
+- Secondly, there is code dealing with user interface and system integration,
+  which makes exclusive use of Android classes.
+- Between these, there is glue code that is responsible for mapping pgp objects
+  to the database, and calling methods provided by the crypto code from the ui
+  code.
+