Sitelet https://github.com/mankan1/java/commit/2b3754d4afc96b0f23ad027ef9495fcbb48a7035
Skip to content

Commit 2b3754d

Browse files
author
gcohen
committed
Merge branch 'gcm' of https://github.com/pubnub/java into gcm
Conflicts: android/examples/PubnubExample/src/com/pubnub/examples/pubnubExample10/MainActivity.java java/examples/src/com/pubnub/examples/PubnubPushSampleCode.java
2 parents 5580ad1 + 497fd11 commit 2b3754d

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎android/examples/PubnubExample/src/com/pubnub/examples/pubnubExample10/MainActivity.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -572,31 +572,31 @@ private void gcmAddChannel() {
572572
builder.setPositiveButton("Add",
573573
new DialogInterface.OnClickListener() {
574574

575-
@Override
576-
public void onClick(DialogInterface dialog, int which) {
577-
578-
if (TextUtils.isEmpty(REG_ID)) {
579-
Toast.makeText(getApplicationContext(),
580-
"GCM Registration id not set. Register to GCM and try again.",
581-
Toast.LENGTH_LONG).show();
582-
return;
583-
}
584-
String channel = edChannelName.getText().toString();
585-
pubnub.enablePushNotificationsOnChannel(channel, REG_ID, new Callback() {
586-
@Override
587-
public void successCallback(String channel,
588-
Object message) {
589-
notifyUser("GCM ADD : " + message);
590-
}
575+
@Override
576+
public void onClick(DialogInterface dialog, int which) {
577+
578+
if (TextUtils.isEmpty(REG_ID)) {
579+
Toast.makeText(getApplicationContext(),
580+
"GCM Registration id not set. Register to GCM and try again.",
581+
Toast.LENGTH_LONG).show();
582+
return ;
583+
}
584+
String channel = edChannelName.getText().toString();
585+
pubnub.enablePushNotificationsOnChannel(channel, REG_ID, new Callback() {
586+
@Override
587+
public void successCallback(String channel,
588+
Object message) {
589+
notifyUser("GCM ADD : " + message);
590+
}
591+
@Override
592+
public void errorCallback(String channel,
593+
PubnubError error) {
594+
notifyUser("GCM ADD : " + error);
595+
}
596+
});
597+
}
598+
});
591599

592-
@Override
593-
public void errorCallback(String channel,
594-
PubnubError error) {
595-
notifyUser("GCM ADD : " + error);
596-
}
597-
});
598-
}
599-
});
600600
AlertDialog alert = builder.create();
601601
alert.show();
602602

‎java/jars/PubnubPushTest.jar‎

-3 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)