From aee3f053fbcc45b8c0058a2f1ca1cd79871ab1f6 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Tue, 31 Aug 2010 18:04:38 -0700
Subject: [PATCH] Remove old ExchangeProvider (legacy GAL support)

Change-Id: I10b5a2ffd429610b2851d0ee63bef20cbc0e0ef8
---
 AndroidManifest.xml                           |   8 -
 .../exchange/provider/ExchangeProvider.java   | 143 ------------------
 2 files changed, 151 deletions(-)
 delete mode 100644 src/com/android/exchange/provider/ExchangeProvider.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4bfdd45b4..bbdc4063c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -414,14 +414,6 @@
         <!--EXCHANGE-REMOVE-SECTION-START-->
         <!-- In this release, GAL information is used locally only, so we used the same
              strict permissions. -->
-        <!-- NOTE: ExchangeDirectoryProvider will replace ExchangeProvider after integration with
-             the new GAL/contacts implementation -->
-        <provider
-            android:name="com.android.exchange.provider.ExchangeProvider"
-            android:authorities="com.android.exchange.provider"
-            android:multiprocess="true"
-            android:permission="com.android.email.permission.ACCESS_PROVIDER"
-            />
         <provider
             android:name="com.android.exchange.provider.ExchangeDirectoryProvider"
             android:authorities="com.android.exchange.directory.provider"
diff --git a/src/com/android/exchange/provider/ExchangeProvider.java b/src/com/android/exchange/provider/ExchangeProvider.java
deleted file mode 100644
index 2a6687909..000000000
--- a/src/com/android/exchange/provider/ExchangeProvider.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import com.android.exchange.EasSyncService;
-import com.android.exchange.provider.GalResult.GalData;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.os.Bundle;
-
-/**
- * ExchangeProvider provides real-time data from the Exchange server; at the moment, it is used
- * solely to provide GAL (Global Address Lookup) service to email address adapters
- */
-public class ExchangeProvider extends ContentProvider {
-    public static final String EXCHANGE_AUTHORITY = "com.android.exchange.provider";
-    public static final Uri GAL_URI = Uri.parse("content://" + EXCHANGE_AUTHORITY + "/gal/");
-
-    private static final int GAL_BASE = 0;
-    private static final int GAL_FILTER = GAL_BASE;
-
-    public static final String[] GAL_PROJECTION = new String[] {"_id", "displayName", "data"};
-    public static final int GAL_COLUMN_ID = 0;
-    public static final int GAL_COLUMN_DISPLAYNAME = 1;
-    public static final int GAL_COLUMN_DATA = 2;
-
-    public static final String EXTRAS_TOTAL_RESULTS = "com.android.exchange.provider.TOTAL_RESULTS";
-
-    private static final UriMatcher sURIMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
-    static {
-        // Exchange URI matching table
-        UriMatcher matcher = sURIMatcher;
-        // The URI for GAL lookup contains three user-supplied parameters in the path:
-        // 1) the account id of the Exchange account
-        // 2) the constraint (filter) text
-        matcher.addURI(EXCHANGE_AUTHORITY, "gal/*/*", GAL_FILTER);
-    }
-
-    private static void addGalDataRow(MatrixCursor mc, long id, String name, String address) {
-        mc.newRow().add(id).add(name).add(address);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        int match = sURIMatcher.match(uri);
-        switch (match) {
-            case GAL_FILTER:
-                long accountId = -1;
-                // Pull out our parameters
-                MatrixCursorExtras c = new MatrixCursorExtras(GAL_PROJECTION);
-                String accountIdString = uri.getPathSegments().get(1);
-                String filter = uri.getPathSegments().get(2);
-                // Make sure we get a valid id; otherwise throw an exception
-                try {
-                    accountId = Long.parseLong(accountIdString);
-                } catch (NumberFormatException e) {
-                    throw new IllegalArgumentException("Illegal value in URI");
-                }
-                // Get results from the Exchange account
-                GalResult galResult = EasSyncService.searchGal(getContext(), accountId, filter);
-                if (galResult != null) {
-                    for (GalData data : galResult.galData) {
-                        addGalDataRow(c, data._id, data.displayName, data.emailAddress);
-                    }
-                    // Use cursor side channel to report metadata
-                    final Bundle bundle = new Bundle();
-                    bundle.putInt(EXTRAS_TOTAL_RESULTS, galResult.total);
-                    c.setExtras(bundle);
-                }
-                return c;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        return -1;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        return "vnd.android.cursor.dir/gal-entry";
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        return null;
-    }
-
-    @Override
-    public boolean onCreate() {
-        return false;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        return -1;
-    }
-
-    /**
-     * A simple extension to MatrixCursor that supports extras
-     */
-    private static class MatrixCursorExtras extends MatrixCursor {
-
-        private Bundle mExtras;
-
-        public MatrixCursorExtras(String[] columnNames) {
-            super(columnNames);
-            mExtras = null;
-        }
-
-        public void setExtras(Bundle extras) {
-            mExtras = extras;
-        }
-
-        @Override
-        public Bundle getExtras() {
-            return mExtras;
-        }
-    }
-}