mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-28 20:45:17 +00:00
0dd36c64a4
1) Move the attachment structures into the encrypted message body.
2) Encrypt attachments with symmetric keys transmitted in the
encryptd attachment pointer structure.
3) Correctly handle asynchronous decryption and categorization of
encrypted push messages.
TODO: Correct notification process and network/interruption
retries.
84 lines
2.8 KiB
Java
84 lines
2.8 KiB
Java
package org.thoughtcrime.securesms.gcm;
|
|
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.util.Log;
|
|
|
|
import com.google.android.gcm.GCMBaseIntentService;
|
|
import org.thoughtcrime.securesms.service.RegistrationService;
|
|
import org.thoughtcrime.securesms.service.SendReceiveService;
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
import org.whispersystems.textsecure.crypto.InvalidVersionException;
|
|
import org.whispersystems.textsecure.push.IncomingEncryptedPushMessage;
|
|
import org.whispersystems.textsecure.push.IncomingPushMessage;
|
|
import org.whispersystems.textsecure.push.PushServiceSocket;
|
|
import org.whispersystems.textsecure.util.Util;
|
|
|
|
import java.io.IOException;
|
|
|
|
public class GcmIntentService extends GCMBaseIntentService {
|
|
|
|
public static final String GCM_SENDER_ID = "312334754206";
|
|
|
|
@Override
|
|
protected void onRegistered(Context context, String registrationId) {
|
|
if (!TextSecurePreferences.isPushRegistered(context)) {
|
|
Intent intent = new Intent(RegistrationService.GCM_REGISTRATION_EVENT);
|
|
intent.putExtra(RegistrationService.GCM_REGISTRATION_ID, registrationId);
|
|
sendBroadcast(intent);
|
|
} else {
|
|
try {
|
|
getGcmSocket(context).registerGcmId(registrationId);
|
|
} catch (IOException e) {
|
|
Log.w("GcmIntentService", e);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onUnregistered(Context context, String registrationId) {
|
|
try {
|
|
getGcmSocket(context).unregisterGcmId();
|
|
} catch (IOException ioe) {
|
|
Log.w("GcmIntentService", ioe);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
protected void onMessage(Context context, Intent intent) {
|
|
try {
|
|
String data = intent.getStringExtra("message");
|
|
Log.w("GcmIntentService", "GCM message: " + data);
|
|
|
|
if (Util.isEmpty(data))
|
|
return;
|
|
|
|
String sessionKey = TextSecurePreferences.getSignalingKey(context);
|
|
IncomingEncryptedPushMessage encryptedMessage = new IncomingEncryptedPushMessage(data, sessionKey);
|
|
IncomingPushMessage message = encryptedMessage.getIncomingPushMessage();
|
|
|
|
Intent service = new Intent(context, SendReceiveService.class);
|
|
service.setAction(SendReceiveService.RECEIVE_PUSH_ACTION);
|
|
service.putExtra("message", message);
|
|
|
|
context.startService(service);
|
|
} catch (IOException e) {
|
|
Log.w("GcmIntentService", e);
|
|
} catch (InvalidVersionException e) {
|
|
Log.w("GcmIntentService", e);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onError(Context context, String s) {
|
|
Log.w("GcmIntentService", "GCM Error: " + s);
|
|
}
|
|
|
|
private PushServiceSocket getGcmSocket(Context context) {
|
|
String localNumber = TextSecurePreferences.getLocalNumber(context);
|
|
String password = TextSecurePreferences.getPushServerPassword(context);
|
|
return new PushServiceSocket(context, localNumber, password);
|
|
}
|
|
}
|