10 files changed, 41 insertions, 4 deletions
diff --git a/cgeo-contacts/build.gradle b/cgeo-contacts/build.gradle
new file mode 100644
index 0000000..f4f3693
--- /dev/null
+++ b/cgeo-contacts/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.1.0"
+
+
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 19
+        versionName "1.1"
+        versionCode 2
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+}
+
+dependencies {
+    compile 'org.apache.commons:commons-lang3:3.3.2'
+    compile files('../main/compile-libs/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar')
+    // The depency to the ICalnder interface from the main project is missing
+    // compile(:main) is not right
+}
+\ No newline at end of file
diff --git a/cgeo-contacts/cgeo-contacts.iml b/cgeo-contacts/cgeo-contacts.iml
index 107cc3a..c045b7e 100644
--- a/cgeo-contacts/cgeo-contacts.iml
+++ b/cgeo-contacts/cgeo-contacts.iml
@@ -19,7 +19,6 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/bin/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/cgeo-contacts/res/values-ca/strings.xml b/cgeo-contacts/res/values-ca/strings.xml
index 68aba93..8ac9921 100644
--- a/cgeo-contacts/res/values-ca/strings.xml
+++ b/cgeo-contacts/res/values-ca/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - contactes (complement)</string>
   <string name="contact_not_found">El contacte amb àlies %s no s\'ha trobat. Primer afegiu-lo a la vostra aplicació de contactes.</string>
+  <string name="multiple_matches">Hi ha múltiples coincidències</string>
 </resources>
diff --git a/cgeo-contacts/res/values-fr/strings.xml b/cgeo-contacts/res/values-fr/strings.xml
index 47dfcc8..52738e5 100644
--- a/cgeo-contacts/res/values-fr/strings.xml
+++ b/cgeo-contacts/res/values-fr/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - contacts (add-on)</string>
   <string name="contact_not_found">Aucun contact avec %s comme pseudo trouvé. Ajoutez le à vos contacts.</string>
+  <string name="multiple_matches">Plusieurs correspondances</string>
 </resources>
diff --git a/cgeo-contacts/res/values-it/strings.xml b/cgeo-contacts/res/values-it/strings.xml
index dbe5be1..9b8bb0d 100644
--- a/cgeo-contacts/res/values-it/strings.xml
+++ b/cgeo-contacts/res/values-it/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - contacts (add-on)</string>
   <string name="contact_not_found">Contatto con alias/nickname %s non trovato. Aggiungilo prima nei tuoi contatti.</string>
+  <string name="multiple_matches">Risultati multipli</string>
 </resources>
diff --git a/cgeo-contacts/res/values-nl/strings.xml b/cgeo-contacts/res/values-nl/strings.xml
index d27d7c6..9967c34 100644
--- a/cgeo-contacts/res/values-nl/strings.xml
+++ b/cgeo-contacts/res/values-nl/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo contacten (plug-in)</string>
   <string name="contact_not_found">Contact met alias/bijnaam %s niet gevonden. Voeg hem (eerst) toe aan je telefoon-contacten.</string>
+  <string name="multiple_matches">Meerdere overeenkomsten</string>
 </resources>
diff --git a/cgeo-contacts/res/values-pl/strings.xml b/cgeo-contacts/res/values-pl/strings.xml
index 6d919f0..b1fcc4a 100644
--- a/cgeo-contacts/res/values-pl/strings.xml
+++ b/cgeo-contacts/res/values-pl/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - kontakty (dodatek)</string>
   <string name="contact_not_found">Kontakt z aliasem/nazwą %s nie został znaleziony. Dodaj go najpierw do swoich kontaktów.</string>
+  <string name="multiple_matches">Wiele pasujących</string>
 </resources>
diff --git a/cgeo-contacts/res/values-ro/strings.xml b/cgeo-contacts/res/values-ro/strings.xml
index db62c95..2a9788a 100644
--- a/cgeo-contacts/res/values-ro/strings.xml
+++ b/cgeo-contacts/res/values-ro/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - contacte (extensie)</string>
   <string name="contact_not_found">Contactul cu numele/alias-ul %s nu a fost găsit. Adaugă-l mai întâi în aplicaţia de contacte.</string>
+  <string name="multiple_matches">Mai multe rezultate</string>
 </resources>
diff --git a/cgeo-contacts/res/values-sv/strings.xml b/cgeo-contacts/res/values-sv/strings.xml
index dbb1d7c..def0f1e 100644
--- a/cgeo-contacts/res/values-sv/strings.xml
+++ b/cgeo-contacts/res/values-sv/strings.xml
@@ -3,4 +3,5 @@
 <resources>
   <string name="app_name">c:geo - Kontakttillägg</string>
   <string name="contact_not_found">Ingen kontakt med aliaset/smeknamnet %s hittades. Lägg till den i dina kontakter först.</string>
+  <string name="multiple_matches">Flera matchningar</string>
 </resources>
diff --git a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
index c9f7656..098f5b9 100644
--- a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
+++ b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
@@ -67,7 +67,7 @@ public final class ContactsActivity extends Activity {
             selectContact(contacts);
         }
         else {
-            int contactId = contacts.get(0).first.intValue();
+            int contactId = contacts.get(0).first;
             openContactAndFinish(contactId);
         }
     }
@@ -83,7 +83,7 @@ public final class ContactsActivity extends Activity {
                 .setItems(items, new OnClickListener() {
 
                     public void onClick(DialogInterface dialog, int which) {
-                        int contactId = contacts.get(which).first.intValue();
+                        int contactId = contacts.get(which).first;
                         dialog.dismiss();
                         openContactAndFinish(contactId);
                     }
@@ -111,7 +111,7 @@ public final class ContactsActivity extends Activity {
             while (cursor != null && cursor.moveToNext()) {
                 int foundId = cursor.getInt(0);
                 String foundName = cursor.getString(1);
-                result.add(new Pair<Integer, String>(Integer.valueOf(foundId), foundName));
+                result.add(new Pair<Integer, String>(foundId, foundName));
             }
         } catch (Exception e) {
             Log.e(LOG_TAG, "ContactsActivity.getContactId", e);