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

Commit 2b533ed5 authored by Mohamed Abdalkader's avatar Mohamed Abdalkader Committed by Brad Ebinger
Browse files

Refactor SMSDispatcher and friends. 

Right now ImsSmsDispatcher acts as both a controller that
has pointers to gsm and cdma dispatchers as well as a
dispatcher itself by extending SmsDispatcher, making the
hirarechy convulted.

For example some methods it override but should not invoke
and some methods cdma and gsm dispatchers override but should
not invoke.

Instead this CL converts ImsSmsDispatcher into a proper controller
in preparation for adding a proper ImsSmsDispatcher.

While here also cleaned up a few things like removing duplicate code.

Test: send/receive ims and non-ims manually
Bug: 69846044
Merged-In: Iee97dbaf2284a04eebad28d3a8da627c283cc8a6
Change-Id: Iee97dbaf2284a04eebad28d3a8da627c283cc8a6
parent 4ce44fde

src/java/com/android/internal/telephony/IccSmsInterfaceManager.java

+16 −15
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class IccSmsInterfaceManager { 
    final protected Context mContext;

    final protected AppOpsManager mAppOps;

    final private UserManager mUserManager;

    protected SMSDispatcher mDispatcher;

    protected SmsDispatchersController mDispatchersController;



    protected Handler mHandler = new Handler() {

        @Override
@@ -131,7 +131,7 @@ public class IccSmsInterfaceManager { 
        mContext = phone.getContext();

        mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);

        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        mDispatcher = new ImsSMSDispatcher(phone,

        mDispatchersController = new SmsDispatchersController(phone,

                phone.mSmsStorageMonitor, phone.mSmsUsageMonitor);

    }
@@ -170,7 +170,7 @@ public class IccSmsInterfaceManager { 


    protected void updatePhoneObject(Phone phone) {

        mPhone = phone;

        mDispatcher.updatePhoneObject(phone);

        mDispatchersController.updatePhoneObject(phone);

    }



    protected void enforceReceiveAndSend(String message) {
@@ -379,7 +379,8 @@ public class IccSmsInterfaceManager { 
            return;

        }

        destAddr = filterDestAddress(destAddr);

        mDispatcher.sendData(destAddr, scAddr, destPort, data, sentIntent, deliveryIntent);

        mDispatchersController.sendData(destAddr, scAddr, destPort, data, sentIntent,

                deliveryIntent);

    }



    /**
@@ -451,7 +452,7 @@ public class IccSmsInterfaceManager { 
            enforcePrivilegedAppPermissions();

        }

        destAddr = filterDestAddress(destAddr);

        mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent,

        mDispatchersController.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent,

                null/*messageUri*/, callingPackage, persistMessageForNonDefaultSmsApp);

    }
@@ -472,7 +473,7 @@ public class IccSmsInterfaceManager { 
                "\n format=" + format +

                "\n receivedIntent=" + receivedIntent);

        }

        mDispatcher.injectSmsPdu(pdu, format, receivedIntent);

        mDispatchersController.injectSmsPdu(pdu, format, receivedIntent);

    }



    /**
@@ -546,7 +547,7 @@ public class IccSmsInterfaceManager { 
                    singleDeliveryIntent = deliveryIntents.get(i);

                }



                mDispatcher.sendText(destAddr, scAddr, singlePart,

                mDispatchersController.sendText(destAddr, scAddr, singlePart,

                        singleSentIntent, singleDeliveryIntent,

                        null/*messageUri*/, callingPackage,

                        persistMessageForNonDefaultSmsApp);
@@ -554,19 +555,19 @@ public class IccSmsInterfaceManager { 
            return;

        }



        mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,

        mDispatchersController.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,

                (ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents,

                null/*messageUri*/, callingPackage, persistMessageForNonDefaultSmsApp);

    }





    public int getPremiumSmsPermission(String packageName) {

        return mDispatcher.getPremiumSmsPermission(packageName);

        return mDispatchersController.getPremiumSmsPermission(packageName);

    }





    public void setPremiumSmsPermission(String packageName, int permission) {

        mDispatcher.setPremiumSmsPermission(packageName, permission);

        mDispatchersController.setPremiumSmsPermission(packageName, permission);

    }



    /**
@@ -919,11 +920,11 @@ public class IccSmsInterfaceManager { 
    }



    public boolean isImsSmsSupported() {

        return mDispatcher.isIms();

        return mDispatchersController.isIms();

    }



    public String getImsSmsFormat() {

        return mDispatcher.getImsSmsFormat();

        return mDispatchersController.getImsSmsFormat();

    }



    public void sendStoredText(String callingPkg, Uri messageUri, String scAddress,
@@ -951,7 +952,7 @@ public class IccSmsInterfaceManager { 
            return;

        }

        textAndAddress[1] = filterDestAddress(textAndAddress[1]);

        mDispatcher.sendText(textAndAddress[1], scAddress, textAndAddress[0],

        mDispatchersController.sendText(textAndAddress[1], scAddress, textAndAddress[0],

                sentIntent, deliveryIntent, messageUri, callingPkg,

                true /* persistMessageForNonDefaultSmsApp */);

    }
@@ -1007,14 +1008,14 @@ public class IccSmsInterfaceManager { 
                    singleDeliveryIntent = deliveryIntents.get(i);

                }



                mDispatcher.sendText(textAndAddress[1], scAddress, singlePart,

                mDispatchersController.sendText(textAndAddress[1], scAddress, singlePart,

                        singleSentIntent, singleDeliveryIntent, messageUri, callingPkg,

                        true  /* persistMessageForNonDefaultSmsApp */);

            }

            return;

        }



        mDispatcher.sendMultipartText(

        mDispatchersController.sendMultipartText(

                textAndAddress[1], // destAddress

                scAddress,

                parts,

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.internal.telephony;



import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;

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



/**

 * Responsible for communications with {@link com.android.ims.ImsManager} to send/receive messages

 * over IMS.

 *

 * TODO: implement

 */

public class ImsSmsDispatcher extends SMSDispatcher {



    /** {@inheritDoc} */

    protected ImsSmsDispatcher(Phone phone, SmsDispatchersController smsDispatchersController) {

        super(phone, smsDispatchersController);

    }



    @Override

    protected String getFormat() {

        return null;

    }



    @Override

    protected boolean shouldBlockSms() {

        return SMSDispatcherUtil.shouldBlockSms(isCdmaMo(), mPhone);

    }



    @Override

    protected SmsMessageBase.SubmitPduBase getSubmitPdu(String scAddr, String destAddr,

            String message, boolean statusReportRequested, SmsHeader smsHeader) {

        return SMSDispatcherUtil.getSubmitPdu(isCdmaMo(), scAddr, destAddr, message,

                statusReportRequested, smsHeader);

    }



    @Override

    protected SmsMessageBase.SubmitPduBase getSubmitPdu(String scAddr, String destAddr,

            int destPort, byte[] message, boolean statusReportRequested) {

        return SMSDispatcherUtil.getSubmitPdu(isCdmaMo(), scAddr, destAddr, destPort, message,

                statusReportRequested);

    }



    @Override

    protected TextEncodingDetails calculateLength(CharSequence messageBody, boolean use7bitOnly) {

        return SMSDispatcherUtil.calculateLength(isCdmaMo(), messageBody, use7bitOnly);

    }



    @Override

    protected void sendSms(SmsTracker tracker) {



    }

}

src/java/com/android/internal/telephony/SMSDispatcher.java

+167 −97

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/ImsSMSDispatcher.java→src/java/com/android/internal/telephony/SmsDispatchersController.java

+495 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+30 −144
Original line number Diff line number Diff line
@@ -20,38 +20,30 @@ import android.app.Activity; 
import android.app.PendingIntent;

import android.app.PendingIntent.CanceledException;

import android.content.Intent;

import android.net.Uri;

import android.os.Message;

import android.os.SystemProperties;

import android.provider.Telephony.Sms;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.SmsManager;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.GsmAlphabet;

import com.android.internal.telephony.GsmCdmaPhone;

import com.android.internal.telephony.ImsSMSDispatcher;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.SMSDispatcher;

import com.android.internal.telephony.SmsConstants;

import com.android.internal.telephony.SMSDispatcher;

import com.android.internal.telephony.SmsDispatchersController;

import com.android.internal.telephony.SmsHeader;

import com.android.internal.telephony.SmsUsageMonitor;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.cdma.sms.UserData;

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

import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;

import com.android.internal.telephony.SmsMessageBase;



import java.util.HashMap;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicInteger;



public class CdmaSMSDispatcher extends SMSDispatcher {

    private static final String TAG = "CdmaSMSDispatcher";

    private static final boolean VDBG = false;



    public CdmaSMSDispatcher(Phone phone, SmsUsageMonitor usageMonitor,

            ImsSMSDispatcher imsSMSDispatcher) {

        super(phone, usageMonitor, imsSMSDispatcher);

    public CdmaSMSDispatcher(Phone phone, SmsDispatchersController smsDispatchersController) {

        super(phone, smsDispatchersController);

        Rlog.d(TAG, "CdmaSMSDispatcher created");

    }
@@ -79,6 +71,29 @@ public class CdmaSMSDispatcher extends SMSDispatcher { 
        }

    }



    @Override

    protected boolean shouldBlockSms() {

        return SMSDispatcherUtil.shouldBlockSms(isCdmaMo(), mPhone);

    }



    @Override

    protected SmsMessageBase.SubmitPduBase getSubmitPdu(String scAddr, String destAddr,

            String message, boolean statusReportRequested, SmsHeader smsHeader) {

        return SMSDispatcherUtil.getSubmitPduCdma(scAddr, destAddr, message,

                statusReportRequested, smsHeader);

    }



    @Override

    protected SmsMessageBase.SubmitPduBase getSubmitPdu(String scAddr, String destAddr,

            int destPort, byte[] message, boolean statusReportRequested) {

        return SMSDispatcherUtil.getSubmitPduCdma(scAddr, destAddr, destPort, message,

                statusReportRequested);

    }



    @Override

    protected TextEncodingDetails calculateLength(CharSequence messageBody, boolean use7bitOnly) {

        return SMSDispatcherUtil.calculateLengthCdma(messageBody, use7bitOnly);

    }

    /**

     * Called from parent class to handle status report from {@code CdmaInboundSmsHandler}.

     * @param sms the CDMA SMS message to process
@@ -104,129 +119,6 @@ public class CdmaSMSDispatcher extends SMSDispatcher { 
        }

    }



    /** {@inheritDoc} */

    @Override

    public void sendData(String destAddr, String scAddr, int destPort,

            byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {

        SmsMessage.SubmitPdu pdu = SmsMessage.getSubmitPdu(

                scAddr, destAddr, destPort, data, (deliveryIntent != null));

        if (pdu != null) {

            HashMap map = getSmsTrackerMap(destAddr, scAddr, destPort, data, pdu);

            SmsTracker tracker = getSmsTracker(map, sentIntent, deliveryIntent, getFormat(),

                    null /*messageUri*/, false /*isExpectMore*/, null /*fullMessageText*/,

                    false /*isText*/, true /*persistMessage*/);



            String carrierPackage = getCarrierAppPackageName();

            if (carrierPackage != null) {

                Rlog.d(TAG, "Found carrier package.");

                DataSmsSender smsSender = new DataSmsSender(tracker);

                smsSender.sendSmsByCarrierApp(carrierPackage, new SmsSenderCallback(smsSender));

            } else {

                Rlog.v(TAG, "No carrier package.");

                sendSubmitPdu(tracker);

            }

        } else {

            Rlog.e(TAG, "CdmaSMSDispatcher.sendData(): getSubmitPdu() returned null");

            if (sentIntent != null) {

                try {

                    sentIntent.send(SmsManager.RESULT_ERROR_GENERIC_FAILURE);

                } catch (CanceledException ex) {

                    Rlog.e(TAG, "Intent has been canceled!");

                }

            }

        }

    }



    /** {@inheritDoc} */

    @Override

    public void sendText(String destAddr, String scAddr, String text, PendingIntent sentIntent,

            PendingIntent deliveryIntent, Uri messageUri, String callingPkg,

            boolean persistMessage) {

        SmsMessage.SubmitPdu pdu = SmsMessage.getSubmitPdu(

                scAddr, destAddr, text, (deliveryIntent != null), null);

        if (pdu != null) {

            HashMap map = getSmsTrackerMap(destAddr, scAddr, text, pdu);

            SmsTracker tracker = getSmsTracker(map, sentIntent, deliveryIntent, getFormat(),

                    messageUri, false /*isExpectMore*/, text, true /*isText*/, persistMessage);



            String carrierPackage = getCarrierAppPackageName();

            if (carrierPackage != null) {

                Rlog.d(TAG, "Found carrier package.");

                TextSmsSender smsSender = new TextSmsSender(tracker);

                smsSender.sendSmsByCarrierApp(carrierPackage, new SmsSenderCallback(smsSender));

            } else {

                Rlog.v(TAG, "No carrier package.");

                sendSubmitPdu(tracker);

            }

        } else {

            Rlog.e(TAG, "CdmaSMSDispatcher.sendText(): getSubmitPdu() returned null");

            if (sentIntent != null) {

                try {

                    sentIntent.send(SmsManager.RESULT_ERROR_GENERIC_FAILURE);

                } catch (CanceledException ex) {

                    Rlog.e(TAG, "Intent has been canceled!");

                }

            }

        }

    }



    /** {@inheritDoc} */

    @Override

    protected void injectSmsPdu(byte[] pdu, String format, PendingIntent receivedIntent) {

        throw new IllegalStateException("This method must be called only on ImsSMSDispatcher");

    }



    /** {@inheritDoc} */

    @Override

    protected GsmAlphabet.TextEncodingDetails calculateLength(CharSequence messageBody,

            boolean use7bitOnly) {

        return SmsMessage.calculateLength(messageBody, use7bitOnly, false);

    }



    /** {@inheritDoc} */

    @Override

    protected SmsTracker getNewSubmitPduTracker(String destinationAddress, String scAddress,

            String message, SmsHeader smsHeader, int encoding,

            PendingIntent sentIntent, PendingIntent deliveryIntent, boolean lastPart,

            AtomicInteger unsentPartCount, AtomicBoolean anyPartFailed, Uri messageUri,

            String fullMessageText) {

        UserData uData = new UserData();

        uData.payloadStr = message;

        uData.userDataHeader = smsHeader;

        if (encoding == SmsConstants.ENCODING_7BIT) {

            uData.msgEncoding = UserData.ENCODING_GSM_7BIT_ALPHABET;

        } else { // assume UTF-16

            uData.msgEncoding = UserData.ENCODING_UNICODE_16;

        }

        uData.msgEncodingSet = true;



        /* By setting the statusReportRequested bit only for the

         * last message fragment, this will result in only one

         * callback to the sender when that last fragment delivery

         * has been acknowledged. */

        SmsMessage.SubmitPdu submitPdu = SmsMessage.getSubmitPdu(destinationAddress,

                uData, (deliveryIntent != null) && lastPart);



        HashMap map = getSmsTrackerMap(destinationAddress, scAddress,

                message, submitPdu);

        return getSmsTracker(map, sentIntent, deliveryIntent,

                getFormat(), unsentPartCount, anyPartFailed, messageUri, smsHeader,

                false /*isExpextMore*/, fullMessageText, true /*isText*/,

                true /*persistMessage*/);

    }



    @Override

    protected void sendSubmitPdu(SmsTracker tracker) {

        if (mPhone.isInEcm()) {

            if (VDBG) {

                Rlog.d(TAG, "Block SMS in Emergency Callback mode");

            }

            tracker.onFailed(mContext, SmsManager.RESULT_ERROR_NO_SERVICE, 0/*errorCode*/);

            return;

        }

        sendRawPdu(tracker);

    }



    /** {@inheritDoc} */

    @Override

    public void sendSms(SmsTracker tracker) {
@@ -237,12 +129,6 @@ public class CdmaSMSDispatcher extends SMSDispatcher { 
                + " mMessageRef=" + tracker.mMessageRef

                + " SS=" + mPhone.getServiceState().getState());



        sendSmsByPstn(tracker);

    }



    /** {@inheritDoc} */

    @Override

    protected void sendSmsByPstn(SmsTracker tracker) {

        int ss = mPhone.getServiceState().getState();

        // if sms over IMS is not supported on data and voice is not available...

        if (!isIms() && ss != ServiceState.STATE_IN_SERVICE) {