aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/ui/SettingsActivity.java2
-rw-r--r--src/eu/siacs/conversations/utils/PhoneHelper.java9
2 files changed, 9 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/SettingsActivity.java b/src/eu/siacs/conversations/ui/SettingsActivity.java
index 1480cd33..c522e058 100644
--- a/src/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/eu/siacs/conversations/ui/SettingsActivity.java
@@ -31,7 +31,7 @@ public class SettingsActivity extends XmppActivity implements
@Override
public void onStop() {
- super.onPause();
+ super.onStop();
PreferenceManager.getDefaultSharedPreferences(this)
.unregisterOnSharedPreferenceChangeListener(this);
}
diff --git a/src/eu/siacs/conversations/utils/PhoneHelper.java b/src/eu/siacs/conversations/utils/PhoneHelper.java
index 975fa219..25cff099 100644
--- a/src/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/eu/siacs/conversations/utils/PhoneHelper.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.utils;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.RejectedExecutionException;
import android.content.Context;
import android.content.CursorLoader;
@@ -67,7 +68,13 @@ public class PhoneHelper {
}
}
});
- mCursorLoader.startLoading();
+ try {
+ mCursorLoader.startLoading();
+ } catch (RejectedExecutionException e) {
+ if (listener != null) {
+ listener.onPhoneContactsLoaded(phoneContacts);
+ }
+ }
}
public static Uri getSefliUri(Context context) {