commit 5c5d71a231a2709e698652b7a3b811dc7f959c28
author Daniel Lehmann <lehmannd@google.com> Tue Mar 23 11:46:31 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 23 11:46:31 2010 -0700
tree 17a7560b2ed7b6dd4948a4c0d931bcf98bc4318f
parent 5ebd9cf83d0659a7c5e666d13040f8d07edf1517
parent 3122da4be743517f04b6f7159bd39f89f87563ce

Merge "When editing contacts, automatically expand "More" if data has been entered Bug:2534580"

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index db93e07..ad6589e 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -26,6 +26,7 @@
 import com.android.contacts.util.Constants;
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -37,6 +38,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.IContentService;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.UriMatcher;
@@ -60,6 +62,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
+import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.provider.Settings;
@@ -821,23 +824,6 @@
         mJustCreated = true;
 
         mSyncEnabled = true;
-//        // Check to see if sync is enabled
-//        final ContentResolver resolver = getContentResolver();
-//        IContentProvider provider = resolver.acquireProvider(Contacts.CONTENT_URI);
-//        if (provider == null) {
-//            // No contacts provider, bail.
-//            finish();
-//            return;
-//        }
-//
-//        try {
-//            ISyncAdapter sa = provider.getSyncAdapter();
-//            mSyncEnabled = sa != null;
-//        } catch (RemoteException e) {
-//            mSyncEnabled = false;
-//        } finally {
-//            resolver.releaseProvider(provider);
-//        }
     }
 
     /**
@@ -963,7 +949,7 @@
             boolean hasSim = ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE))
                     .hasIccCard();
             boolean createShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction());
-            if (mSyncEnabled) {
+            if (isSyncActive()) {
                 if (createShortcut) {
                     // Help text is the same no matter whether there is SIM or not.
                     empty.setText(getText(R.string.noContactsHelpTextWithSyncForCreateShortcut));
@@ -985,6 +971,23 @@
         }
     }
 
+    private boolean isSyncActive() {
+        Account[] accounts = AccountManager.get(this).getAccounts();
+        if (accounts != null && accounts.length > 0) {
+            IContentService contentService = ContentResolver.getContentService();
+            for (Account account : accounts) {
+                try {
+                    if (contentService.isSyncActive(account, ContactsContract.AUTHORITY)) {
+                        return true;
+                    }
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Could not get the sync status");
+                }
+            }
+        }
+        return false;
+    }
+
     private void buildUserGroupUri(String group) {
         mGroupUri = Uri.withAppendedPath(Contacts.CONTENT_GROUP_URI, group);
     }