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

Commit b320289c authored by Adnan's avatar Adnan Committed by Danny Baumann
Browse files

Dialer: Handle "Unknown" and null numbers when adding to blacklist. 

JIRA: BACON-278
Change-Id: I819968e06387b2cf4ddd9e9d47fdf87b6099a98b
parent 1759c04f

res/values/cm_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
    <string name="call_stats_sort_by_count">Sort by call count</string>



    <string name="menu_add_to_blacklist">Add to blacklist</string>

    <string name="toast_added_to_blacklist">%s added to blacklist.</string>

    <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> added to blacklist</string>



    <!-- Forward lookup -->

    <string name="nearby_places">Nearby places</string>

src/com/android/dialer/CallDetailActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    private boolean mHasTrashOption;

    /** Whether we should show "remove from call log" in the options menu. */

    private boolean mHasRemoveFromCallLogOption;

    /** Whether we should show "add to blacklist" in the options menu. */

    private boolean mHasAddToBlacklistOption;



    private ProximitySensorManager mProximitySensorManager;

    private final ProximitySensorListener mProximitySensorListener = new ProximitySensorListener();
@@ -370,6 +372,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
                mHasEditNumberBeforeCallOption = mCallDetailHeader.canEditNumberBeforeCall();

                mHasTrashOption = hasVoicemail();

                mHasRemoveFromCallLogOption = !hasVoicemail();

                mHasAddToBlacklistOption = mCallDetailHeader.canPlaceCallsTo();

                invalidateOptionsMenu();



                ListView historyList = (ListView) findViewById(R.id.history);
@@ -555,6 +558,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        // We don't have this action for voicemails, because you can just use the trash button.

        menu.findItem(R.id.menu_remove_from_call_log).setVisible(mHasRemoveFromCallLogOption);

        menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCallOption);

        menu.findItem(R.id.menu_add_to_blacklist).setVisible(mHasAddToBlacklistOption);

        menu.findItem(R.id.menu_trash).setVisible(mHasTrashOption);

        return super.onPrepareOptionsMenu(menu);

    }

src/com/android/dialer/calllog/ContactInfoHelper.java

+3 −7
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.dialer.lookup.LookupCache; 
import com.android.dialer.service.CachedNumberLookupService;

import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo;

import com.android.dialerbind.ObjectFactory;

import com.android.internal.telephony.util.BlacklistUtils;



import org.json.JSONException;

import org.json.JSONObject;
@@ -280,13 +281,8 @@ public class ContactInfoHelper { 
     * @param number the number to be blacklisted

     */

    public void addNumberToBlacklist(String number) {

        ContentValues cv = new ContentValues();

        cv.put(Telephony.Blacklist.PHONE_MODE, 1);



        Uri uri = Uri.withAppendedPath(Telephony.Blacklist.CONTENT_FILTER_BYNUMBER_URI, number);

        int count = mContext.getContentResolver().update(uri, cv, null, null);



        if (count != 0) {

        if (BlacklistUtils.addOrUpdate(mContext, number,

                BlacklistUtils.BLOCK_CALLS, BlacklistUtils.BLOCK_CALLS)) {

            // Give the user some feedback

            String message = mContext.getString(R.string.toast_added_to_blacklist, number);

            Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();

src/com/android/dialer/callstats/CallStatsDetailActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ public class CallStatsDetailActivity extends Activity { 
    public boolean onPrepareOptionsMenu(Menu menu) {

        menu.findItem(R.id.menu_edit_number_before_call).setVisible(

                mCallDetailHeader.canEditNumberBeforeCall());

        menu.findItem(R.id.menu_add_to_blacklist).setVisible(

                mCallDetailHeader.canPlaceCallsTo());

        return super.onPrepareOptionsMenu(menu);

    }