Skip to content

Commit

Permalink
Fix push messaging registration for some apps
Browse files Browse the repository at this point in the history
  • Loading branch information
@mar-v-in
mar-v-in committed Aug 28, 2018
1 parent bdb04c9 commit 9e0ee10
Showing 1 changed file with 146 additions and 6 deletions.
152 changes: 146 additions & 6 deletions play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
import android.support.annotation.Nullable;
import android.util.Log;

import org.microg.gms.checkin.CheckinService;
Expand Down Expand Up @@ -177,24 +184,28 @@ public static void replyNotAvailable(Context context, Intent intent, String pack
}

public static void registerAndReply(Context context, Intent intent, String packageName, String requestId) {
Intent outIntent = new Intent(ACTION_C2DM_REGISTRATION);
String sender = intent.getStringExtra(EXTRA_SENDER);
String appSignature = PackageUtils.firstSignatureDigest(context, packageName);
String regId = register(context, packageName, appSignature, sender, null).token;
Intent outIntent = createRegistrationReply(regId, requestId);

Log.d(TAG, "register[res]: " + outIntent + " extras=" + outIntent.getExtras());
sendReply(context, intent, packageName, outIntent);
}

private static Intent createRegistrationReply(String regId, String requestId) {
Intent outIntent = new Intent(ACTION_C2DM_REGISTRATION);
if (regId != null) {
outIntent.putExtra(EXTRA_REGISTRATION_ID, attachRequestId(regId, requestId));
} else {
outIntent.putExtra(EXTRA_ERROR, attachRequestId(ERROR_SERVICE_NOT_AVAILABLE, requestId));
}

Log.d(TAG, "register[res]: " + outIntent + " extras=" + outIntent.getExtras());
sendReply(context, intent, packageName, outIntent);
return outIntent;
}

private static void sendReply(Context context, Intent intent, String packageName, Intent outIntent) {

try {
if (intent.hasExtra(EXTRA_MESSENGER)) {
if (intent != null && intent.hasExtra(EXTRA_MESSENGER)) {
Messenger messenger = intent.getParcelableExtra(EXTRA_MESSENGER);
Message message = Message.obtain();
message.obj = outIntent;
Expand Down Expand Up @@ -259,4 +270,133 @@ private static String attachRequestId(String msg, String requestId) {
if (requestId == null) return msg;
return "|ID|" + requestId + "|" + msg;
}

@Nullable
@Override
public IBinder onBind(Intent intent) {
Log.d(TAG, "onBind: " + intent.toString());
if (ACTION_C2DM_REGISTER.equals(intent.getAction())) {
Messenger messenger = new Messenger(new FcmHandler(this));
return messenger.getBinder();
}
return super.onBind(intent);
}

private static class FcmRegisterTask extends AsyncTask<Void, Void, RegisterResponse> {
private Context context;
private String packageName;
private String sender;
private Callback callback;

public FcmRegisterTask(Context context, String packageName, String sender, Callback callback) {
this.context = context;
this.packageName = packageName;
this.sender = sender;
this.callback = callback;
}

public interface Callback {
void onResult(RegisterResponse registerResponse);
}

@Override
protected RegisterResponse doInBackground(Void... voids) {
return register(context, packageName, PackageUtils.firstSignatureDigest(context, packageName), sender, null, false);
}

@Override
protected void onPostExecute(RegisterResponse registerResponse) {
callback.onResult(registerResponse);
}
}

private static class FcmHandler extends Handler {
private Context context;
private int callingUid;

public FcmHandler(Context context) {
this.context = context;
}

@Override
public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
this.callingUid = Binder.getCallingUid();
return super.sendMessageAtTime(msg, uptimeMillis);
}

@Override
public void handleMessage(Message msg) {
if (msg.what == 0) {
if (msg.obj instanceof Intent) {
Message nuMsg = Message.obtain();
nuMsg.what = msg.what;
nuMsg.arg1 = 0;
nuMsg.replyTo = null;
PendingIntent pendingIntent = ((Intent) msg.obj).getParcelableExtra(EXTRA_APP);
String packageName = PackageUtils.packageFromPendingIntent(pendingIntent);
Bundle data = new Bundle();
data.putBoolean("oneWay", false);
data.putString("pkg", packageName);
data.putBundle("data", msg.getData());
nuMsg.setData(data);
msg = nuMsg;
} else {
return;
}
}
int what = msg.what;
int id = msg.arg1;
Messenger replyTo = msg.replyTo;
if (replyTo == null) {
Log.w(TAG, "replyTo is null");
return;
}
Bundle data = msg.getData();
if (data.getBoolean("oneWay", false)) {
Log.w(TAG, "oneWay requested");
return;
}
String packageName = data.getString("pkg");
Bundle subdata = data.getBundle("data");
String sender = subdata.getString("sender");
try {
PackageUtils.checkPackageUid(context, packageName, callingUid);
} catch (SecurityException e) {
Log.w(TAG, e);
return;
}
new FcmRegisterTask(context, packageName, sender, registerResponse -> {
Bundle data1 = new Bundle();
if (registerResponse != null) {
data1.putString(EXTRA_REGISTRATION_ID, registerResponse.token);
} else {
data1.putString(EXTRA_ERROR, ERROR_SERVICE_NOT_AVAILABLE);
}

if (what == 0) {
Intent outIntent = new Intent(ACTION_C2DM_REGISTRATION);
outIntent.putExtras(data1);
Message message = Message.obtain();
message.obj = outIntent;
try {
replyTo.send(message);
} catch (RemoteException e) {
Log.w(TAG, e);
}
} else {
Bundle messageData = new Bundle();
messageData.putBundle("data", data1);
Message response = Message.obtain();
response.what = what;
response.arg1 = id;
response.setData(messageData);
try {
replyTo.send(response);
} catch (RemoteException e) {
Log.w(TAG, e);
}
}
}).execute();
}
}
}

12 comments on commit 9e0ee10

@hiciu
Copy link

@hiciu hiciu commented on 9e0ee10 Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mar-v-in thank you! This commit has enabled slack notifications on my device.

@sm4rk0
Copy link

@sm4rk0 sm4rk0 commented on 9e0ee10 Sep 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hiciu did you have to reinstall slack for notifications to work?

@chris42
Copy link

@chris42 chris42 commented on 9e0ee10 Sep 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, after update of microg, you need to reinstall every app that uses push notifications to register.
Please only install the app, do not use backup solutions (e.g. titanium backup, oandbackup, etc.) to restore the app or data.

@NormalRa
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chris42 When you say "reinstall" do you mean it is necessary to first uninstall the app (which deletes all backup data) and then install it again, or is just installing the app again sufficient?

p.s. Huge thanks to you @chris42 for the buildfix-1806 branch, as well as the continuous efforts to have this push issue resolved!

@chris42
Copy link

@chris42 chris42 commented on 9e0ee10 Sep 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NormalRa
yes, you need to uninstall first and then reinstall. I cannot speak for slack, but e.g. for Whatsapp, the app internal backup you created stays on the phone. You can use that to recover your messages with the restore in whatsapp on install.

However backup solutions like Titanium backup, etc. work differently and also backup the push registration as app data. Hence if you restore with that, you would reset your registration back to your old one. That would not work.

@ildar
Copy link

@ildar ildar commented on 9e0ee10 Sep 5, 2018 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hiciu
Copy link

@hiciu hiciu commented on 9e0ee10 Sep 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sm4rk0 I did not; I just started to receive chat notification out of blue. And at the same time I got "Your notifications are now mobile" email from slack.

But I'm pretty sure I did reboot my phone between updating microg and receiving first notification; not sure if this has something to do with it.

@julienschmidt
Copy link
Contributor

@julienschmidt julienschmidt commented on 9e0ee10 Sep 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, after update of microg, you need to reinstall every app that uses push notifications to register.
Please only install the app, do not use backup solutions (e.g. titanium backup, oandbackup, etc.) to restore the app or data.

This wasn't the case for me. Most apps, such as WhatsApp, reregistered automatically after a while (a few hours).
These apps are listed as "Not Registered" in microg, but that seems to be just a bug. Push notifications work fine (battery optimizations on).

@syntech16
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not an expert in GCM/FCM, but: I think that the update of the notification ID will depend on how the app is programmed. Both apparently provide some mechanisms to update the token ID like onTokenRefresh (GCM) and onNewToken (FCM).

My guess is that they're optional (but highly recommended) to be implemented, so some or most of them may already refresh on their own...

@NormalRa
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chris42 Using WhatsApp's backup mechanism occurred to me, but I read somewhere that these are only 7-day backups. Would restoring such a backup restore the entire chat history?

Regardless, it seems that WhatsApp has appeared in the microG GCM listing as "Not registered" even though I had not uninstalled-then-installed. However, I did first reinstall the app and probably updated it in the meantime.

Also, presently, something feels a bit wonky because sometimes messages aren't received by WhatsApp and when I open the application from the launcher a deluge of messages occurs! This wasn't the case when no registration to GCM was possible since I had marked WhatsApp to not be optimized with respect to battery. Perhaps this is merely a symptom of Android's doze mechanism, or there needs to be more work on microG? Not sure.

@julienschmidt I can confirm that WhatsApp registered automatically for a while.

@sm4rk0
Copy link

@sm4rk0 sm4rk0 commented on 9e0ee10 Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry for splitting the discussion from another issue. Let's continue there.
You'll also see that: there is a bug that causes some newly registered apps to not show up as registered (but those are still properly registered and receive push messages).

@chris42
Copy link

@chris42 chris42 commented on 9e0ee10 Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hiciu @julienschmidt You would be the first, but glad to hear that it works.

@NormalRa I was using the backup on the phone and it restored my whole history (at least I can find messages from 2015 on there)
The FAQ just states, that Whatsapp will offer the last 7 days of backups. Hence this should be a question of how many different backups you have, not the content.

Regarding the messages not arriving on time, could you check if microg is in your "not optimized" apps list. If so, this is normally a sign, that Whatsapp has fallen back to polling and I would recommend reinstall of Whatsapp.

BTW most of this should be discussed in issue #439 , not in the commit.

Please sign in to comment.