Skip to content

Commit 11bf3b6

Browse files
author
Devendra
committed
adding gcm functionality to demo console app
1 parent d6050dd commit 11bf3b6

43 files changed

Lines changed: 181 additions & 1193 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

android/Pubnub-Android-3.6.1.jar

4.06 KB
Binary file not shown.

android/examples/PubnubExample/AndroidManifest.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.pubnub.examples.pubnubExample"
2+
package="com.pubnub.examples.pubnubExample10"
33
android:versionCode="1"
44
android:versionName="1.0">
55
<uses-sdk
@@ -11,19 +11,30 @@
1111
android:label="@string/app_name"
1212
android:theme="@style/AppTheme">
1313

14-
<activity android:name=".MainActivity"
14+
<activity android:name="com.pubnub.examples.pubnubExample10.MainActivity"
1515
android:label="@string/app_name">
1616
<intent-filter>
1717
<action android:name="android.intent.action.MAIN"/>
1818
<category android:name="android.intent.category.LAUNCHER"/>
1919
</intent-filter>
2020
</activity>
21-
21+
<receiver
22+
android:name=".GcmBroadcastReceiver"
23+
android:permission="com.google.android.c2dm.permission.SEND" >
24+
<intent-filter>
25+
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
26+
<category android:name="com.example.gcm" />
27+
</intent-filter>
28+
</receiver>
29+
<service android:name=".GcmIntentService" />
2230
</application>
2331

2432
<uses-permission android:name="android.permission.INTERNET"/>
2533
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
2634
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
2735
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
36+
<uses-permission android:name="android.permission.WAKE_LOCK" />
37+
38+
2839

2940
</manifest>
4.06 KB
Binary file not shown.
230 KB
Binary file not shown.
-760 Bytes
Loading

android/examples/PubnubExample/res/layout/usage.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,21 @@
187187
android:layout_width="wrap_content"
188188
android:layout_height="wrap_content"
189189
android:text="@string/option28" />
190+
<TextView
191+
android:id="@+id/option29"
192+
android:layout_width="wrap_content"
193+
android:layout_height="wrap_content"
194+
android:text="@string/option29" />
195+
<TextView
196+
android:id="@+id/option30"
197+
android:layout_width="wrap_content"
198+
android:layout_height="wrap_content"
199+
android:text="@string/option30" />
200+
<TextView
201+
android:id="@+id/option31"
202+
android:layout_width="wrap_content"
203+
android:layout_height="wrap_content"
204+
android:text="@string/option31" />
190205
</LinearLayout>
191206

192207
</LinearLayout>

android/examples/PubnubExample/res/menu/activity_main.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626
<item android:id="@+id/option25" android:title="@string/option25" android:titleCondensed="@string/option25"></item>
2727
<item android:id="@+id/option26" android:title="@string/option26" android:titleCondensed="@string/option26"></item>
2828
<item android:id="@+id/option27" android:title="@string/option27" android:titleCondensed="@string/option27"></item>
29-
<item android:id="@+id/option28" android:title="@string/option28" android:titleCondensed="@string/option28"></item>
29+
<item android:id="@+id/option28" android:title="@string/option28" android:titleCondensed="@string/option28"></item>
30+
<item android:id="@+id/option29" android:title="@string/option29" android:titleCondensed="@string/option29"></item>
31+
<item android:id="@+id/option30" android:title="@string/option30" android:titleCondensed="@string/option30"></item>
32+
<item android:id="@+id/option31" android:title="@string/option31" android:titleCondensed="@string/option31"></item>
3033
</menu>

android/examples/PubnubExample/res/values/strings.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@
3939
<string name="option20">Set Presence Heartbeat ( in seconds )</string>
4040
<string name="option21">Set UUID</string>
4141
<string name="option22">Set State</string>
42-
<string name="option23">Set Presence Heartbeat Interval ( in seconds )</string>
43-
<string name="option24">Register on GCM</string>
44-
<string name="option25">Unregister on GCM</string>
45-
<string name="option26">Add channel to GCM</string>
46-
<string name="option27">Remove channel from GCM</string>
47-
<string name="option28">Remove all channels from GCM</string>
42+
<string name="option23">Set Auth Key</string>
43+
<string name="option24">Init</string>
44+
<string name="option25">Set Presence Heartbeat Interval ( in seconds )</string>
45+
<string name="option26">Set GCM Sender ID</string>
46+
<string name="option27">Register on GCM</string>
47+
<string name="option28">Unregister on GCM</string>
48+
<string name="option29">Add channel to GCM</string>
49+
<string name="option30">Remove channel from GCM</string>
50+
<string name="option31">Remove all channels from GCM</string>
4851
</resources>

android/examples/PubnubExample/src/com/pubnub/examples/pubnubExample/GcmBroadcastReceiver.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

android/examples/PubnubExample/src/com/pubnub/examples/pubnubExample/GcmIntentService.java

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)