PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity
open-keychain/src/org/thialfihar/android/apg
History
Markus Doits 1b7fbb1eeb Update to latest version in master 
Merge branch 'master' into apg_service

Conflicts:
	src/org/thialfihar/android/apg/Apg.java
	src/org/thialfihar/android/apg/Preferences.java
2011-11-03 20:14:24 +01:00
..
provider set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
ui/widget show key fingerprint in key list 2010-12-25 19:12:35 +00:00
utils Documentation update of ApgCon 2011-06-05 19:47:41 +00:00
Apg.java Update to latest version in master 2011-11-03 20:14:24 +01:00
ApgService.java Cleanup of code, AIDL-calls renamed! 2011-06-05 19:05:57 +00:00
AskForSecretKeyPassPhrase.java catch null pointer exceptions when the private key cannot be extracted, also prevent such keys from getting imported, so the error message should never be encountered anyway 2010-09-10 20:36:38 +00:00
BaseActivity.java testing thread-pausing in verifyText() 2010-09-12 19:06:26 +00:00
CachedPassPhrase.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
Constants.java testing thread-pausing in verifyText() 2010-09-12 19:06:26 +00:00
DataDestination.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
DataSource.java DataSource: consider content URI sources "binary" also 2010-12-25 14:12:12 +00:00
DecryptActivity.java auto-click encrypt/decrypt button when using an *_AND_RETURN Intent with EXTRA_DATA or ContentURI 2010-12-25 19:24:04 +00:00
EditKeyActivity.java moved some Intent extra constants into more appropriate places, some basic preparations to test thread-pausing during decryption/encryption to deal with certain situations, mainly an unknown signature key 2010-09-11 23:21:53 +00:00
EncryptActivity.java applied proposed patch by mattispasch for issue 99 2011-03-19 18:23:54 +00:00
FileDialog.java added an optional checkbox to the file dialog, can be used for instance to optionally delete files after importing them, and is used for that, also rearranged the option menu items for the main activity a little 2010-07-26 21:57:28 +00:00
GeneralActivity.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
HkpKeyServer.java show key fingerprint in key list 2010-12-25 19:12:35 +00:00
IApgService.aidl Cleanup of code, AIDL-calls renamed! 2011-06-05 19:05:57 +00:00
Id.java testing thread-pausing in verifyText() 2010-09-12 19:06:26 +00:00
InputData.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
KeyListActivity.java show key fingerprint in key list 2010-12-25 19:12:35 +00:00
KeyServer.java gave HKP server proper error handling, going through all IPs of a pool until a response is received, reporting "too many responses", "no keys found", "insufficient query" correctly 2010-08-17 14:51:39 +00:00
KeyServerPreferenceActivity.java added a key server preference, allowing multiple key servers to be added 2010-08-17 21:49:34 +00:00
KeyServerQueryActivity.java show key fingerprint in key list 2010-12-25 19:12:35 +00:00
MailListActivity.java moved some Intent extra constants into more appropriate places, some basic preparations to test thread-pausing during decryption/encryption to deal with certain situations, mainly an unknown signature key 2010-09-11 23:21:53 +00:00
MainActivity.java moved some Intent extra constants into more appropriate places, some basic preparations to test thread-pausing during decryption/encryption to deal with certain situations, mainly an unknown signature key 2010-09-11 23:21:53 +00:00
PausableThread.java moved some Intent extra constants into more appropriate places, some basic preparations to test thread-pausing during decryption/encryption to deal with certain situations, mainly an unknown signature key 2010-09-11 23:21:53 +00:00
PositionAwareInputStream.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
Preferences.java don't include a Preference re-instantiation for now, will see about that when merging apg_service 2011-02-05 16:11:07 +00:00
PreferencesActivity.java moved IntegerListPreference to apg.ui.widget 2010-08-17 22:03:56 +00:00
Primes.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
ProgressDialogUpdater.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
PublicKeyListActivity.java integrated key server look-up into decrypt Activity, allowing to touch an unkown signature to import the key 2010-08-18 12:26:13 +00:00
SecretKeyListActivity.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00
SelectPublicKeyListActivity.java 1.0.x changes merged into trunk 2010-07-16 20:18:43 +00:00
SelectPublicKeyListAdapter.java show key fingerprint in key list 2010-12-25 19:12:35 +00:00
SelectSecretKeyListActivity.java 1.0.x changes merged into trunk 2010-07-16 20:18:43 +00:00
SelectSecretKeyListAdapter.java show key fingerprint in key list 2010-12-25 19:12:35 +00:00
Service.java set svn:eol-style to LF for all code/resource files 2010-07-16 20:13:12 +00:00