Skip to content

Update ContactsServicePlugin.java fix crash when go back with android #358

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

Open
tunm1228 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ContactsServicePlugin.java fix crash when go back with android #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 38 additions & 26 deletions .../src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,41 +269,53 @@ void finishWithResult(Object result) {
}
}

@Override
public boolean onActivityResult(int requestCode, int resultCode, Intent intent) {
if(requestCode == REQUEST_OPEN_EXISTING_CONTACT || requestCode == REQUEST_OPEN_CONTACT_FORM) {
@Override
public boolean onActivityResult(int requestCode, int resultCode, Intent intent) {
if (requestCode == REQUEST_OPEN_EXISTING_CONTACT || requestCode == REQUEST_OPEN_CONTACT_FORM) {
try {
Uri ur = intent.getData();
finishWithResult(getContactByIdentifier(ur.getLastPathSegment()));
Uri ur = intent.getData();
finishWithResult(getContactByIdentifier(ur.getLastPathSegment()));
} catch (NullPointerException e) {
finishWithResult(FORM_OPERATION_CANCELED);
finishWithResult(FORM_OPERATION_CANCELED);
}
return true;
}
}

if (requestCode == REQUEST_OPEN_CONTACT_PICKER) {
if (resultCode == RESULT_CANCELED) {
finishWithResult(FORM_OPERATION_CANCELED);
return true;
if (requestCode == REQUEST_OPEN_CONTACT_PICKER) {
try {
if (resultCode == RESULT_CANCELED || intent == null) {
finishWithResult(FORM_OPERATION_CANCELED);
return true;
}

Uri contactUri = intent.getData();
if (contactUri == null) {
finishWithResult(FORM_OPERATION_CANCELED);
return true;
}

Cursor cursor = contentResolver.query(contactUri, null, null, null, null);
if (cursor != null && cursor.moveToFirst()) {
String id = contactUri.getLastPathSegment();
getContacts("openDeviceContactPicker", id, false, false, false, localizedLabels, this.result);
} else {
Log.e(LOG_TAG, "onActivityResult - cursor.moveToFirst() returns false");
finishWithResult(FORM_OPERATION_CANCELED);
}
if (cursor != null) {
cursor.close();
}
} catch (Exception e) {
Log.e(LOG_TAG, "Error in contact picker: " + e.getMessage());
finishWithResult(FORM_OPERATION_CANCELED);
}
Uri contactUri = intent.getData();
if (intent != null){
Cursor cursor = contentResolver.query(contactUri, null, null, null, null);
if (cursor.moveToFirst()) {
String id = contactUri.getLastPathSegment();
getContacts("openDeviceContactPicker", id, false, false, false, localizedLabels, this.result);
} else {
Log.e(LOG_TAG, "onActivityResult - cursor.moveToFirst() returns false");
finishWithResult(FORM_OPERATION_CANCELED);
}}else{return true;}
cursor.close();
return true;
}

finishWithResult(FORM_COULD_NOT_BE_OPEN);
return false;
}

finishWithResult(FORM_COULD_NOT_BE_OPEN);
return false;
}

void openExistingContact(Contact contact) {
String identifier = contact.identifier;
try {
Expand Down