diff options
| author | Chris Wren <cwren@android.com> | 2013-04-18 17:58:51 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2013-04-18 17:58:51 -0400 |
| commit | 36b4f3e8a630f10a885d20440a4241aa3b1c6677 (patch) | |
| tree | 7046495e31cd224e58323943085040b45ee0c1c0 /src/com/android/calendar/alerts | |
| parent | 08f6c0cd717d9ce5197028e81c469b27ae9f6cf3 (diff) | |
| download | android_packages_apps_Calendar-36b4f3e8a630f10a885d20440a4241aa3b1c6677.tar.gz android_packages_apps_Calendar-36b4f3e8a630f10a885d20440a4241aa3b1c6677.tar.bz2 android_packages_apps_Calendar-36b4f3e8a630f10a885d20440a4241aa3b1c6677.zip | |
GCM demands that everything be a String.
Also put prefixes on the keys, to avoid collisions.
Bug: 8640246
Change-Id: I16771eb0427b20c315c011e7049f038d0bdab062
Diffstat (limited to 'src/com/android/calendar/alerts')
| -rw-r--r-- | src/com/android/calendar/alerts/GlobalDismissManager.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/calendar/alerts/GlobalDismissManager.java b/src/com/android/calendar/alerts/GlobalDismissManager.java index 16011de2..f743986a 100644 --- a/src/com/android/calendar/alerts/GlobalDismissManager.java +++ b/src/com/android/calendar/alerts/GlobalDismissManager.java @@ -69,10 +69,11 @@ public class GlobalDismissManager extends BroadcastReceiver { Calendars.ACCOUNT_TYPE }; - public static final String SYNC_ID = "sync_id"; - public static final String START_TIME = "start_time"; - public static final String ACCOUNT_NAME = "account_name"; // redundant? - public static final String DISMISS_INTENT = "com.android.calendar.alerts.DISMISS"; + public static final String KEY_PREFIX = "com.android.calendar.alerts."; + public static final String SYNC_ID = KEY_PREFIX + "sync_id"; + public static final String START_TIME = KEY_PREFIX + "start_time"; + public static final String ACCOUNT_NAME = KEY_PREFIX + "account_name"; + public static final String DISMISS_INTENT = KEY_PREFIX + "DISMISS"; public static class AlarmId { public long mEventId; @@ -240,7 +241,7 @@ public class GlobalDismissManager extends BroadcastReceiver { String account = syncIdToAccount.get(syncId); Bundle data = new Bundle(); data.putString(SYNC_ID, syncId); - data.putLong(START_TIME, alarmId.mStart); + data.putString(START_TIME, Long.toString(alarmId.mStart)); data.putString(ACCOUNT_NAME, account); try { cnb.send(account, @@ -355,7 +356,7 @@ public class GlobalDismissManager extends BroadcastReceiver { boolean updated = false; if (intent.hasExtra(SYNC_ID) && intent.hasExtra(ACCOUNT_NAME)) { String syncId = intent.getStringExtra(SYNC_ID); - long startTime = intent.getLongExtra(START_TIME, 0L); + long startTime = Long.parseLong(intent.getStringExtra(START_TIME)); ContentResolver resolver = context.getContentResolver(); Uri uri = asSync(Events.CONTENT_URI, GOOGLE_ACCOUNT_TYPE, |