From 4df24dd1853906e8554a6badba46134ffdc3751b Mon Sep 17 00:00:00 2001
From: Olli Raitio <olli.raitio@helsinki.fi>
Date: Mon, 7 Dec 2015 16:58:42 +0200
Subject: [PATCH 1/2] fix memory leak. For real this time

---
 .../lokki/android/services/ContactService.java           | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/App/src/main/java/cc/softwarefactory/lokki/android/services/ContactService.java b/App/src/main/java/cc/softwarefactory/lokki/android/services/ContactService.java
index 9d97177e..4ecd7ac6 100644
--- a/App/src/main/java/cc/softwarefactory/lokki/android/services/ContactService.java
+++ b/App/src/main/java/cc/softwarefactory/lokki/android/services/ContactService.java
@@ -31,11 +31,11 @@ public class ContactService extends ApiService {
     private final String restPath = "contacts";
     private final String TAG = "ContactService";
 
-    private Map<String, Contact> phoneContacts;
+    private static Map<String, Contact> phoneContacts;
 
     public ContactService(Context context) {
         super(context);
-        generatePhoneContactsMapFromList(new DefaultContactDataSource().getContacts(context));
+        if (phoneContacts == null) generatePhoneContactsMapFromList(new DefaultContactDataSource().getContacts(context));
     }
 
     private void generatePhoneContactsMapFromList(List<Contact> phoneContactsList) {
@@ -328,11 +328,6 @@ public List<Contact> getPhoneContacts() {
         return new ArrayList(phoneContacts.values());
     }
 
-    // for dependency injenction
-    public void setPhoneContacts(List<Contact> phoneContacts) {
-        generatePhoneContactsMapFromList(phoneContacts);
-    }
-
     private Contact getSynchronizedWithPhone(Contact contact) {
         Contact synchronizedContact = new Contact();
         Contact phoneContact = phoneContacts.get(contact.getEmail());

From e259fffb56ff10e67da311dea8b13e97fa78e511 Mon Sep 17 00:00:00 2001
From: Olli Raitio <olli.raitio@helsinki.fi>
Date: Mon, 7 Dec 2015 16:59:14 +0200
Subject: [PATCH 2/2] increment version number

---
 App/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App/build.gradle b/App/build.gradle
index feac22fa..af691d99 100755
--- a/App/build.gradle
+++ b/App/build.gradle
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 421
-        versionName "4.2.1"
+        versionCode 422
+        versionName "4.2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }