Skip to content

Merge #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olzraiti merged 3 commits into from
Dec 7, 2015
Merged

Merge #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4df24dd
fix memory leak. For real this time
olzraiti Dec 7, 2015
e259fff
increment version number
olzraiti Dec 7, 2015
dc7cf7a
Merge pull request #448 from olzraiti/dev
olzraiti Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions App/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
9 changes: 2 additions & 7 deletions App/src/main/java/cc/softwarefactory/lokki/android/services/ContactService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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());
Expand Down