Upgrade to new GCM API.

This commit is contained in:
Moxie Marlinspike
2014-07-23 15:40:45 -07:00
parent c632b32ff8
commit 9ef14a0f64
14 changed files with 234 additions and 239 deletions

View File

@@ -45,7 +45,7 @@ import android.util.Log;
import android.widget.Toast;
import com.actionbarsherlock.view.MenuItem;
import com.google.android.gcm.GCMRegistrar;
import com.google.android.gms.gcm.GoogleCloudMessaging;
import org.thoughtcrime.securesms.components.OutgoingSmsPreference;
import org.thoughtcrime.securesms.contacts.ContactAccessor;
@@ -344,7 +344,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
PushServiceSocket socket = PushServiceSocketFactory.create(context);
socket.unregisterGcmId();
GCMRegistrar.unregister(context);
GoogleCloudMessaging.getInstance(context).unregister();
return SUCCESS;
} catch (AuthorizationFailedException afe) {
Log.w("ApplicationPreferencesActivity", afe);