fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2025-12-26 11:43:08 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

Changed GCM update workflow since it's not necessary to remove the old entry

Browse Source
This commit is contained in:
felipeal
2012-08-08 16:54:57 +00:00
parent 986b323bd7
commit 16d8449189
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
android/src/com/google/android/apps/chrometophone/DeviceRegistrar.java
View File

@@ -54,7 +54,7 @@ public class DeviceRegistrar {
public void run() { public void run() {
Intent updateUIIntent = new Intent("com.google.ctp.UPDATE_UI"); Intent updateUIIntent = new Intent("com.google.ctp.UPDATE_UI");
try { try {
HttpResponse res = makeRequest(context, deviceRegistrationID, REGISTER_PATH, "gcm"); HttpResponse res = makeRequest(context, deviceRegistrationID, REGISTER_PATH);
if (res.getStatusLine().getStatusCode() == 200) { if (res.getStatusLine().getStatusCode() == 200) {
GCMRegistrar.setRegisteredOnServer(context, true); GCMRegistrar.setRegisteredOnServer(context, true);
updateUIIntent.putExtra(STATUS_EXTRA, REGISTERED_STATUS); updateUIIntent.putExtra(STATUS_EXTRA, REGISTERED_STATUS);
@@ -66,6 +66,16 @@ public class DeviceRegistrar {
updateUIIntent.putExtra(STATUS_EXTRA, ERROR_STATUS); updateUIIntent.putExtra(STATUS_EXTRA, ERROR_STATUS);
} }
context.sendBroadcast(updateUIIntent); context.sendBroadcast(updateUIIntent);
// Check if this is an update from C2DM to GCM - if it is, remove the
// old registration id.
SharedPreferences settings = Prefs.get(context);
String c2dmRegId = settings.getString("deviceRegistrationID", null);
if (c2dmRegId != null) {
Log.i(TAG, "Removing old C2DM registration id");
SharedPreferences.Editor editor = settings.edit();
editor.remove("deviceRegistrationID");
editor.commit();
}
} catch (AppEngineClient.PendingAuthException pae) { } catch (AppEngineClient.PendingAuthException pae) {
// Get setup activity to ask permission from user. // Get setup activity to ask permission from user.
Intent intent = new Intent(SetupActivity.AUTH_PERMISSION_ACTION); Intent intent = new Intent(SetupActivity.AUTH_PERMISSION_ACTION);
@@ -80,14 +90,13 @@ public class DeviceRegistrar {
}).start(); }).start();
} }
public static void unregisterWithServer(final Context context, public static void unregisterWithServer(final Context context, final String deviceRegistrationID) {
final String deviceRegistrationID, final String deviceType) {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
Intent updateUIIntent = new Intent("com.google.ctp.UPDATE_UI"); Intent updateUIIntent = new Intent("com.google.ctp.UPDATE_UI");
try { try {
HttpResponse res = makeRequest(context, deviceRegistrationID, UNREGISTER_PATH, deviceType); HttpResponse res = makeRequest(context, deviceRegistrationID, UNREGISTER_PATH);
if (res.getStatusLine().getStatusCode() != 200) { if (res.getStatusLine().getStatusCode() != 200) {
Log.w(TAG, "Unregistration error " + Log.w(TAG, "Unregistration error " +
String.valueOf(res.getStatusLine().getStatusCode())); String.valueOf(res.getStatusLine().getStatusCode()));
@@ -99,14 +108,7 @@ public class DeviceRegistrar {
} finally { } finally {
SharedPreferences settings = Prefs.get(context); SharedPreferences settings = Prefs.get(context);
SharedPreferences.Editor editor = settings.edit(); SharedPreferences.Editor editor = settings.edit();
if (deviceType.equals("gcm")) { editor.remove("accountName");
editor.remove("accountName");
} else {
// this is an update from C2DM to GCM - keep the account,
// but remove the old regId (the new one will be stored
// on GCM's library preferences)
editor.remove("deviceRegistrationID");
}
editor.commit(); editor.commit();
updateUIIntent.putExtra(STATUS_EXTRA, UNREGISTERED_STATUS); updateUIIntent.putExtra(STATUS_EXTRA, UNREGISTERED_STATUS);
} }
@@ -118,7 +120,7 @@ public class DeviceRegistrar {
} }
private static HttpResponse makeRequest(Context context, String deviceRegistrationID, private static HttpResponse makeRequest(Context context, String deviceRegistrationID,
String urlPath, String deviceType) throws Exception { String urlPath) throws Exception {
String accountName = getAccountName(context); String accountName = getAccountName(context);
List<NameValuePair> params = new ArrayList<NameValuePair>(); List<NameValuePair> params = new ArrayList<NameValuePair>();
@@ -132,7 +134,7 @@ public class DeviceRegistrar {
// TODO: Allow device name to be configured // TODO: Allow device name to be configured
params.add(new BasicNameValuePair("deviceName", isTablet(context) ? "Tablet" : "Phone")); params.add(new BasicNameValuePair("deviceName", isTablet(context) ? "Tablet" : "Phone"));
params.add(new BasicNameValuePair("deviceType", deviceType)); params.add(new BasicNameValuePair("deviceType", "gcm"));
AppEngineClient client = new AppEngineClient(context, accountName); AppEngineClient client = new AppEngineClient(context, accountName);
return client.makeRequest(urlPath, params); return client.makeRequest(urlPath, params);
@@ -161,7 +163,8 @@ public class DeviceRegistrar {
// preferences; the new version stores it in the GCM library. // preferences; the new version stores it in the GCM library.
if (c2dmRegId != null) { if (c2dmRegId != null) {
Log.i(TAG, "Updating from C2DM to GCM"); Log.i(TAG, "Updating from C2DM to GCM");
DeviceRegistrar.unregisterWithServer(context, c2dmRegId, "ac2dm"); // Since the server will update the existing DeviceInfo entry to use GCM,
// it's not necessary to call unregister
GCMRegistrar.register(context, DeviceRegistrar.SENDER_ID); GCMRegistrar.register(context, DeviceRegistrar.SENDER_ID);
return true; return true;
} else { } else {

2
android/src/com/google/android/apps/chrometophone/GCMIntentService.java
View File

@@ -41,7 +41,7 @@ public class GCMIntentService extends GCMBaseIntentService {
@Override @Override
public void onUnregistered(Context context, String registration) { public void onUnregistered(Context context, String registration) {
DeviceRegistrar.unregisterWithServer(context, registration, "gcm"); DeviceRegistrar.unregisterWithServer(context, registration);
} }
@Override @Override