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
ui/widget
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
BaseActivity.java
CachedPassPhrase.java
Constants.java
DataDestination.java
DataSource.java
DecryptActivity.java
EditKeyActivity.java
EncryptActivity.java	applied proposed patch by mattispasch for issue 99	2011-03-19 18:23:54 +00:00
FileDialog.java
GeneralActivity.java
HkpKeyServer.java
IApgService.aidl	Cleanup of code, AIDL-calls renamed!	2011-06-05 19:05:57 +00:00
Id.java
InputData.java
KeyListActivity.java
KeyServer.java
KeyServerPreferenceActivity.java
KeyServerQueryActivity.java
MailListActivity.java
MainActivity.java
PausableThread.java
PositionAwareInputStream.java
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
Primes.java
ProgressDialogUpdater.java
PublicKeyListActivity.java
SecretKeyListActivity.java
SelectPublicKeyListActivity.java
SelectPublicKeyListAdapter.java
SelectSecretKeyListActivity.java
SelectSecretKeyListAdapter.java
Service.java