removed useless semicolons, fixed some parameters in documenation, simplified some conditionals

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java

@@ -304,7 +304,7 @@ public class KeychainProvider extends ContentProvider {
     /**
      * Returns type of the query (secret/public)
      *
-     * @param uri
+     * @param match
      * @return
      */
     private int getKeyType(int match) {
@@ -862,7 +862,8 @@ public class KeychainProvider extends ContentProvider {
      * Build default selection statement for KeyRings. If no extra selection is specified only build
      * where clause with rowId
      *
-     * @param uri
+     * @param defaultSelection
+     * @param keyType
      * @param selection
      * @return
      */