Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3c2d7e authored by Michael W's avatar Michael W
Browse files

Dialer: Lookup: Remove Auskunft / PeopleLookup 

* auskunft.at is for sale
* auskunft.at/search redirects to firmeninfo.at which needs
  a paid[1] account to do search
* Since Auskunft was the only PeopleLookup we had, remove that completely
* Make restoreLookupProvider restore to the default, not the first item
  and also restore that if the last selected one isn't in the list
  (which we need since we removed an item that could have been selected)

[1] https://www.firmeninfo.at/preise/privat?l=en

Change-Id: Iff8233ce5575100930e2169a16a9491c773a14bf
parent 932abb41

java/com/android/dialer/binary/aosp/AospDialerApplication.java

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ public class AospDialerApplication extends DialerApplication implements 
    return new PhoneDirectoryExtender() {

      @Override

      public boolean isEnabled(Context context) {

        return LookupSettings.isForwardLookupEnabled(AospDialerApplication.this)

            || LookupSettings.isPeopleLookupEnabled(AospDialerApplication.this);

        return LookupSettings.isForwardLookupEnabled(AospDialerApplication.this);

      }



      @Override

java/com/android/dialer/lookup/LookupProvider.java

+0 −9
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ public class LookupProvider extends ContentProvider { 
  public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);

  public static final Uri NEARBY_LOOKUP_URI =

      Uri.withAppendedPath(AUTHORITY_URI, "nearby");

  public static final Uri PEOPLE_LOOKUP_URI =

      Uri.withAppendedPath(AUTHORITY_URI, "people");

  public static final Uri NEARBY_AND_PEOPLE_LOOKUP_URI =

      Uri.withAppendedPath(AUTHORITY_URI, "nearby_and_people");

  public static final Uri IMAGE_CACHE_URI =
@@ -311,13 +309,6 @@ public class LookupProvider extends ContentProvider { 
        results.addAll(nearby);

      }

    }

    if (type == PEOPLE || type == NEARBY_AND_PEOPLE) {

      PeopleLookup pl = PeopleLookup.getInstance(getContext());

      List<ContactInfo> people = pl.lookup(getContext(), filter);

      if (people != null) {

        results.addAll(people);

      }

    }



    if (results.isEmpty()) {

      if (DEBUG) Log.v(TAG, "handleFilter(" + filter + "): No results");

java/com/android/dialer/lookup/LookupSettings.java

+1 −24
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ public final class LookupSettings { 
  public static final String FLP_OPENSTREETMAP = "OpenStreetMap";

  public static final String FLP_DEFAULT = FLP_OPENSTREETMAP;



  /** People lookup providers */

  public static final String PLP_AUSKUNFT = "Auskunft";

  public static final String PLP_DEFAULT = PLP_AUSKUNFT;



  /** Reverse lookup providers */

  public static final String RLP_OPENCNAM = "OpenCnam";

  public static final String RLP_YELLOWPAGES = "YellowPages";
@@ -37,17 +33,14 @@ public final class LookupSettings { 
  public static final String RLP_ZABASEARCH = "ZabaSearch";

  public static final String RLP_CYNGN_CHINESE = "CyngnChinese";

  public static final String RLP_DASTELEFONBUCH = "DasTelefonbuch";

  public static final String RLP_AUSKUNFT = "Auskunft";

  public static final String RLP_DEFAULT = RLP_OPENCNAM;



  /** Preferences */

  private static final String SHARED_PREFERENCES_NAME = "lookup_settings";

  private static final String ENABLE_FORWARD_LOOKUP = "enable_forward_lookup";

  private static final String ENABLE_PEOPLE_LOOKUP = "enable_people_lookup";

  private static final String ENABLE_REVERSE_LOOKUP = "enable_reverse_lookup";

  private static final String FORWARD_LOOKUP_PROVIDER = "forward_lookup_provider2";

  private static final String PEOPLE_LOOKUP_PROVIDER = "people_lookup_provider";

  private static final String REVERSE_LOOKUP_PROVIDER = "reverse_lookup_provider";

  private static final String REVERSE_LOOKUP_PROVIDER = "reverse_lookup_provider2";

  private static final String OPENCNAM_ACCOUNT_SID = "opencnam_account_sid";

  private static final String OPENCNAM_AUTH_TOKEN = "opencnam_auth_token";
@@ -66,14 +59,6 @@ public final class LookupSettings { 
    getSharedPreferences(context).edit().putBoolean(ENABLE_FORWARD_LOOKUP, value).commit();

  }



  public static boolean isPeopleLookupEnabled(Context context) {

    return getSharedPreferences(context).getBoolean(ENABLE_PEOPLE_LOOKUP, false);

  }



  public static void setPeopleLookupEnabled(Context context, boolean value) {

    getSharedPreferences(context).edit().putBoolean(ENABLE_PEOPLE_LOOKUP, value).commit();

  }



  public static boolean isReverseLookupEnabled(Context context) {

    return getSharedPreferences(context).getBoolean(ENABLE_REVERSE_LOOKUP, false);

  }
@@ -90,14 +75,6 @@ public final class LookupSettings { 
    getSharedPreferences(context).edit().putString(FORWARD_LOOKUP_PROVIDER, value).commit();

  }



  public static String getPeopleLookupProvider(Context context) {

    return getSharedPreferences(context).getString(PEOPLE_LOOKUP_PROVIDER, PLP_DEFAULT);

  }



  public static void setPeopleLookupProvider(Context context, String value) {

    getSharedPreferences(context).edit().putString(PEOPLE_LOOKUP_PROVIDER, value).commit();

  }



  public static String getReverseLookupProvider(Context context) {

    return getSharedPreferences(context).getString(REVERSE_LOOKUP_PROVIDER, RLP_DEFAULT);

  }

java/com/android/dialer/lookup/LookupSettingsFragment.java

+28 −22
Original line number Diff line number Diff line
@@ -31,17 +31,13 @@ public class LookupSettingsFragment extends PreferenceFragment 
    implements Preference.OnPreferenceChangeListener {



  private static final String KEY_ENABLE_FORWARD_LOOKUP = "enable_forward_lookup";

  private static final String KEY_ENABLE_PEOPLE_LOOKUP = "enable_people_lookup";

  private static final String KEY_ENABLE_REVERSE_LOOKUP = "enable_reverse_lookup";

  private static final String KEY_FORWARD_LOOKUP_PROVIDER = "forward_lookup_provider";

  private static final String KEY_PEOPLE_LOOKUP_PROVIDER = "people_lookup_provider";

  private static final String KEY_REVERSE_LOOKUP_PROVIDER = "reverse_lookup_provider";



  private SwitchPreference enableForwardLookup;

  private SwitchPreference enablePeopleLookup;

  private SwitchPreference enableReverseLookup;

  private ListPreference forwardLookupProvider;

  private ListPreference peopleLookupProvider;

  private ListPreference reverseLookupProvider;



  @Override
@@ -51,19 +47,15 @@ public class LookupSettingsFragment extends PreferenceFragment 
    addPreferencesFromResource(R.xml.lookup_settings);



    enableForwardLookup = (SwitchPreference) findPreference(KEY_ENABLE_FORWARD_LOOKUP);

    enablePeopleLookup = (SwitchPreference) findPreference(KEY_ENABLE_PEOPLE_LOOKUP);

    enableReverseLookup = (SwitchPreference) findPreference(KEY_ENABLE_REVERSE_LOOKUP);



    enableForwardLookup.setOnPreferenceChangeListener(this);

    enablePeopleLookup.setOnPreferenceChangeListener(this);

    enableReverseLookup.setOnPreferenceChangeListener(this);



    forwardLookupProvider = (ListPreference) findPreference(KEY_FORWARD_LOOKUP_PROVIDER);

    peopleLookupProvider = (ListPreference) findPreference(KEY_PEOPLE_LOOKUP_PROVIDER);

    reverseLookupProvider = (ListPreference) findPreference(KEY_REVERSE_LOOKUP_PROVIDER);



    forwardLookupProvider.setOnPreferenceChangeListener(this);

    peopleLookupProvider.setOnPreferenceChangeListener(this);

    reverseLookupProvider.setOnPreferenceChangeListener(this);

  }
@@ -81,14 +73,10 @@ public class LookupSettingsFragment extends PreferenceFragment 


    if (preference == enableForwardLookup) {

      LookupSettings.setForwardLookupEnabled(context, (Boolean) newValue);

    } else if (preference == enablePeopleLookup) {

      LookupSettings.setPeopleLookupEnabled(context, (Boolean) newValue);

    } else if (preference == enableReverseLookup) {

      LookupSettings.setReverseLookupEnabled(context, (Boolean) newValue);

    } else if (preference == forwardLookupProvider) {

      LookupSettings.setForwardLookupProvider(context, (String) newValue);

    } else if (preference == peopleLookupProvider) {

      LookupSettings.setPeopleLookupProvider(context, (String) newValue);

    } else if (preference == reverseLookupProvider) {

      LookupSettings.setReverseLookupProvider(context, (String) newValue);

    }
@@ -100,7 +88,6 @@ public class LookupSettingsFragment extends PreferenceFragment 
    Context context = getContext();



    enableForwardLookup.setChecked(LookupSettings.isForwardLookupEnabled(context));

    enablePeopleLookup.setChecked(LookupSettings.isPeopleLookupEnabled(context));

    enableReverseLookup.setChecked(LookupSettings.isReverseLookupEnabled(context));

  }
@@ -108,7 +95,6 @@ public class LookupSettingsFragment extends PreferenceFragment 
    Context context = getContext();



    restoreLookupProvider(forwardLookupProvider, LookupSettings.getForwardLookupProvider(context));

    restoreLookupProvider(peopleLookupProvider, LookupSettings.getPeopleLookupProvider(context));

    restoreLookupProvider(reverseLookupProvider, LookupSettings.getReverseLookupProvider(context));

  }
@@ -121,17 +107,37 @@ public class LookupSettingsFragment extends PreferenceFragment 
    }



    if (provider == null) {

      pref.setValueIndex(0);



      setDefaultProvider(pref);

    } else {

      String[] providers = new String[0];

      if (pref == forwardLookupProvider) {

        LookupSettings.setForwardLookupProvider(context, pref.getValue());

      } else if (pref == peopleLookupProvider) {

        LookupSettings.setPeopleLookupProvider(context, pref.getValue());

        providers = getContext().getResources().getStringArray(R.array.forward_lookup_providers);

      } else if (pref == reverseLookupProvider) {

        LookupSettings.setReverseLookupProvider(context, pref.getValue());

        providers = getContext().getResources().getStringArray(R.array.reverse_lookup_providers);

      }



      boolean found = false;

      for (String p : providers) {

        if (p.equals(provider)) {

          found = true;

          break;

        }

      }



      if (!found) {

        setDefaultProvider(pref);

      } else {

        pref.setValue(provider);

      }

    }

  }



  private void setDefaultProvider(ListPreference pref) {

    Context context = getContext();

    if (pref == forwardLookupProvider) {

      LookupSettings.setForwardLookupProvider(context, LookupSettings.FLP_DEFAULT);

    } else if (pref == reverseLookupProvider) {

      LookupSettings.setReverseLookupProvider(context, LookupSettings.RLP_DEFAULT);

    }

  }

}

java/com/android/dialer/lookup/PeopleLookup.java

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Xiao-Long Chen <chillermillerlong@hotmail.com>

 *

 * 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.dialer.lookup;



import android.content.Context;

import android.util.Log;



import com.android.dialer.phonenumbercache.ContactInfo;

import com.android.dialer.lookup.auskunft.AuskunftPeopleLookup;



import java.util.List;



public abstract class PeopleLookup {

  private static final String TAG = PeopleLookup.class.getSimpleName();



  private static PeopleLookup INSTANCE = null;



  public static PeopleLookup getInstance(Context context) {

    String provider = LookupSettings.getPeopleLookupProvider(context);



    if (INSTANCE == null || !isInstance(provider)) {

      Log.d(TAG, "Chosen people lookup provider: " + provider);



      if (provider.equals(LookupSettings.PLP_AUSKUNFT)) {

        INSTANCE = new AuskunftPeopleLookup(context);

      }

    }



    return INSTANCE;

  }



  private static boolean isInstance(String provider) {

    if (provider.equals(LookupSettings.PLP_AUSKUNFT)

        && INSTANCE instanceof AuskunftPeopleLookup) {

      return true;

    } else {

      return false;

    }

  }



  public abstract List<ContactInfo> lookup(Context context, String filter);

}