karol/quik
0
0
Fork 0
forked from upstream-mirrors/quik
Code Pull Requests Actions Releases 10 Activity

Use Timber for all logs

Browse Source
This commit is contained in:
moezbhatti
2019-06-09 23:53:51 -04:00
parent c4a49a73d5
commit e1c26d055c
59 changed files with 505 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android-smsmms/src/main/java/com/android/mms/transaction/PushReceiver.java
+13 -19
View File
@@ -29,7 +29,6 @@ import android.os.AsyncTask;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Mms.Inbox;
import com.android.mms.MmsConfig;
import com.android.mms.logs.LogTag;
import com.google.android.mms.ContentType;
import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.DeliveryInd;
@@ -39,7 +38,7 @@ import com.google.android.mms.pdu_alt.PduHeaders;
import com.google.android.mms.pdu_alt.PduParser;
import com.google.android.mms.pdu_alt.PduPersister;
import com.google.android.mms.pdu_alt.ReadOrigInd;
import com.klinker.android.logger.Log;
import timber.log.Timber;
import java.util.HashSet;
import java.util.Set;
@@ -48,16 +47,13 @@ import java.util.concurrent.Executors;
import static android.provider.Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION;
import static android.provider.Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION;
import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_DELIVERY_IND;
import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_READ_ORIG_IND;
import static com.google.android.mms.pdu_alt.PduHeaders.*;
/**
* Receives Intent.WAP_PUSH_RECEIVED_ACTION intents and starts the
* TransactionService by passing the push-data to it.
*/
public class PushReceiver extends BroadcastReceiver {
private static final String TAG = LogTag.TAG;
static final String[] PROJECTION = new String[]{Mms.CONTENT_LOCATION, Mms.LOCKED};
@@ -77,7 +73,7 @@ public class PushReceiver extends BroadcastReceiver {
@Override
protected Void doInBackground(Intent... intents) {
Log.v(TAG, "receiving a new mms message");
Timber.v("receiving a new mms message");
Intent intent = intents[0];
// Get raw PDU push-data from the message and parse it
@@ -86,7 +82,7 @@ public class PushReceiver extends BroadcastReceiver {
GenericPdu pdu = parser.parse();
if (pdu == null) {
Log.e(TAG, "Invalid PUSH data");
Timber.e("Invalid PUSH data");
return null;
}
@@ -142,30 +138,28 @@ public class PushReceiver extends BroadcastReceiver {
String location = getContentLocation(mContext, uri);
if (downloadedUrls.contains(location)) {
Log.v(TAG, "already added this download, don't download again");
Timber.v("already added this download, don't download again");
return null;
} else {
downloadedUrls.add(location);
}
Log.v(TAG, "receiving on a lollipop+ device");
DownloadManager.getInstance().downloadMultimediaMessage(mContext, location, uri, true);
} else {
Log.v(TAG, "Skip downloading duplicate message: " + new String(nInd.getContentLocation()));
Timber.v("Skip downloading duplicate message: " + new String(nInd.getContentLocation()));
}
break;
}
default:
Log.e(TAG, "Received unrecognized PDU.");
Timber.e("Received unrecognized PDU.");
}
} catch (MmsException e) {
Log.e(TAG, "Failed to save the data from PUSH: type=" + type, e);
Timber.e(e, "Failed to save the data from PUSH: type=" + type);
} catch (RuntimeException e) {
Log.e(TAG, "Unexpected RuntimeException.", e);
Timber.e(e, "Unexpected RuntimeException.");
}
Log.v(TAG, "PUSH Intent processed.");
Timber.v("PUSH Intent processed.");
return null;
}
@@ -178,15 +172,15 @@ public class PushReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Log.v(TAG, intent.getAction() + " " + intent.getType());
Timber.v(intent.getAction() + " " + intent.getType());
if ((intent.getAction().equals(WAP_PUSH_DELIVER_ACTION) || intent.getAction().equals(WAP_PUSH_RECEIVED_ACTION))
&& ContentType.MMS_MESSAGE.equals(intent.getType())) {
Log.v(TAG, "Received PUSH Intent: " + intent);
Timber.v("Received PUSH Intent: " + intent);
MmsConfig.init(context);
new ReceivePushTask(context, goAsync()).executeOnExecutor(PUSH_RECEIVER_EXECUTOR, intent);
Log.v("mms_receiver", context.getPackageName() + " received and aborted");
Timber.v(context.getPackageName() + " received and aborted");
}
}