commit 9d2bcfb40d0ee107886eb99eba13a840e944ba43
author Dianne Hackborn <hackbod@google.com> Mon Dec 20 11:44:27 2010 -0800
committer Dianne Hackborn <hackbod@google.com> Mon Dec 20 11:44:27 2010 -0800
tree 273cfa352b9b6d9cd37be1478709d3a30e315013
parent 37dc7cf5eaf4e313a077e102ef86c422bc35df6e

Update to new Loader APIs.

Change-Id: I4be23901304890e1d0237d81e6cfb3889d5b6591

src/com/android/contacts/ContactLoader.java

diff --git a/src/com/android/contacts/ContactLoader.java b/src/com/android/contacts/ContactLoader.java
index e70cf69..80519a5 100644
--- a/src/com/android/contacts/ContactLoader.java
+++ b/src/com/android/contacts/ContactLoader.java
@@ -986,10 +986,4 @@
         mContact = null;
         mDestroyed = true;
     }
-
-    public void destroy() {
-        unregisterObserver();
-        mContact = null;
-        mDestroyed = true;
-    }
 }

src/com/android/contacts/detail/ContactDetailFragment.java

diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index ccbdb7c..636f74c 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -274,7 +274,7 @@
         mTransitionAnimationRequested = mContactDataDisplayed;
         mContactDataDisplayed = true;
         if (mLookupUri == null) {
-            getLoaderManager().stopLoader(LOADER_DETAILS);
+            getLoaderManager().destroyLoader(LOADER_DETAILS);
             mContactData = null;
             bindData();
         } else if (getActivity() != null) {

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 80baa42..2326021 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -730,7 +730,7 @@
 
         // If we are about to close the editor - there is no need to refresh the data
         if (saveMode == SaveMode.CLOSE) {
-            getLoaderManager().stopLoader(LOADER_DATA);
+            getLoaderManager().destroyLoader(LOADER_DATA);
         }
 
         mStatus = Status.SAVING;

src/com/android/contacts/interactions/ContactDeletionInteraction.java

diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 7426593..b90482d 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -208,7 +208,7 @@
     public void onDismiss(DialogInterface dialog) {
         mActive = false;
         mDialog = null;
-        getLoaderManager().stopLoader(LOADER_ID);
+        getLoaderManager().destroyLoader(LOADER_ID);
     }
 
     @Override

src/com/android/contacts/interactions/PhoneNumberInteraction.java

diff --git a/src/com/android/contacts/interactions/PhoneNumberInteraction.java b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
index c0b6eef..5834189 100644
--- a/src/com/android/contacts/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
@@ -204,7 +204,7 @@
      */
     public void startInteraction(Uri contactUri) {
         if (mLoader != null) {
-            mLoader.destroy();
+            mLoader.reset();
         }
 
         mLoader = new CursorLoader(mContext,

src/com/android/contacts/list/ContactListFilterController.java

diff --git a/src/com/android/contacts/list/ContactListFilterController.java b/src/com/android/contacts/list/ContactListFilterController.java
index 111dcd0..21468a0 100644
--- a/src/com/android/contacts/list/ContactListFilterController.java
+++ b/src/com/android/contacts/list/ContactListFilterController.java
@@ -110,7 +110,7 @@
     }
 
     public void onStop() {
-        mLoaderManager.stopLoader(R.id.contact_list_filter_loader);
+        mLoaderManager.destroyLoader(R.id.contact_list_filter_loader);
     }
 
     private SharedPreferences getSharedPreferences() {

src/com/android/contacts/list/ContactListFilterLoader.java

diff --git a/src/com/android/contacts/list/ContactListFilterLoader.java b/src/com/android/contacts/list/ContactListFilterLoader.java
index 72ceda0..e2fdfda 100644
--- a/src/com/android/contacts/list/ContactListFilterLoader.java
+++ b/src/com/android/contacts/list/ContactListFilterLoader.java
@@ -168,7 +168,7 @@
     }
 
     @Override
-    public void destroy() {
+    public void reset() {
         stopLoading();
     }
 }

src/com/android/contacts/list/DirectoryListLoader.java

diff --git a/src/com/android/contacts/list/DirectoryListLoader.java b/src/com/android/contacts/list/DirectoryListLoader.java
index 23a0b78..b98762a 100644
--- a/src/com/android/contacts/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/list/DirectoryListLoader.java
@@ -190,7 +190,7 @@
     }
 
     @Override
-    public void destroy() {
+    public void reset() {
         stopLoading();
     }
 }