licenses into readme

3 files changed, 43 insertions, 29 deletions

diff --git a/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java b/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java
index 32dd84675..d5325673b 100644
--- a/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java
+++ b/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java
@@ -57,8 +57,8 @@ public class ApgKeyService extends Service {
     }
 
     /**
-     * This is the implementation of the interface IApgService. All methods are oneway, meaning
-     * asynchronous and return to the client using IApgHandler.
+     * This is the implementation of the interface IApgKeyService. All methods are oneway, meaning
+     * asynchronous and return to the client using handlers.
      * 
      * The real PGP code is located in PGPMain.
      */
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index bbf4af663..000000000
--- a/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-The following open source projects are used in APG:
-
-  * ZXing QRCode Integration
-    http://code.google.com/p/zxing/
-    Apache License v2
-
-  * SpongyCastle
-    https://github.com/rtyley/spongycastle
-    MIT X11 License
-
-Images:
-
-  * icon.svg
-    modified version of kgpg_key2_kopete.svgz
-
-  * dashboard_manage_keys.svg, dashboard_my_keys.svg, key.svg
-    http://rrze-icon-set.berlios.de/
-    Creative Commons Attribution Share-Alike licence 3.0
-
-  * dashboard_decrypt.svg, dashboard_encrypt.svg, dashboard_help.svg
-    http://tango.freedesktop.org/
-    Public Domain
-
-  * dashboard_scan_qrcode.svg
-    New creation for APG
-    Apache License v2
\ No newline at end of file
diff --git a/README.md b/README.md
index 86be161c6..b0af955f5 100644
--- a/README.md
+++ b/README.md
@@ -105,4 +105,44 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
 * ACCESS_API
 
 ## ApgKeyService (Remote Service)
-* ACCESS_KEYS
\ No newline at end of file
+* ACCESS_KEYS
+
+# Licenses
+APG is licensed under Apache License v2.
+
+## Libraries
+* ActionBarSherlock  
+  http://actionbarsherlock.com/  
+  Apache License v2
+
+* SpongyCastle  
+  https://github.com/rtyley/spongycastle  
+  MIT X11 License
+
+* ZXing QRCode Integration  
+  http://code.google.com/p/zxing/  
+  Apache License v2
+
+* HTMLCleaner  
+  http://htmlcleaner.sourceforge.net/  
+  BSD License
+
+* HtmlSpanner  
+  Apache License v2
+
+
+## Images
+* icon.svg  
+  modified version of kgpg_key2_kopete.svgz
+
+* dashboard_manage_keys.svg, dashboard_my_keys.svg, key.svg  
+  http://rrze-icon-set.berlios.de/  
+  Creative Commons Attribution Share-Alike licence 3.0
+
+* dashboard_decrypt.svg, dashboard_encrypt.svg, dashboard_help.svg  
+  http://tango.freedesktop.org/  
+  Public Domain
+
+* dashboard_scan_qrcode.svg  
+  New creation for APG  
+  Apache License v2
\ No newline at end of file