Skip to content

Commit 6babe63

Browse files
author
Devendra
committed
adding presence expiry settings to demo apps
1 parent fdb8c01 commit 6babe63

Some content is hidden

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

48 files changed

+2725
-2077
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.6
1+
3.6.0

‎android/Pubnub-Android-3.5.6.jar‎

-48.7 KB
Binary file not shown.

‎android/Pubnub-Android-3.6.0.jar‎

54.3 KB
Binary file not shown.

‎android/examples/PubnubExample/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@
2424
<uses-permission android:name="android.permission.INTERNET"/>
2525
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
2626
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
27-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
2827

2928
</manifest>

‎android/examples/PubnubExample/libs/Pubnub-Android-3.5.6.jar‎

-48.7 KB
Binary file not shown.

‎android/examples/PubnubExample/libs/Pubnub-Android-3.6.0.jar‎

54.3 KB
Binary file not shown.

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,31 @@
125125
android:layout_width="wrap_content"
126126
android:layout_height="wrap_content"
127127
android:text="@string/option16" />
128+
<TextView
129+
android:id="@+id/option17"
130+
android:layout_width="wrap_content"
131+
android:layout_height="wrap_content"
132+
android:text="@string/option17" />
133+
<TextView
134+
android:id="@+id/option18"
135+
android:layout_width="wrap_content"
136+
android:layout_height="wrap_content"
137+
android:text="@string/option18" />
138+
<TextView
139+
android:id="@+id/option19"
140+
android:layout_width="wrap_content"
141+
android:layout_height="wrap_content"
142+
android:text="@string/option19" />
143+
<TextView
144+
android:id="@+id/option20"
145+
android:layout_width="wrap_content"
146+
android:layout_height="wrap_content"
147+
android:text="@string/option20" />
148+
<TextView
149+
android:id="@+id/option21"
150+
android:layout_width="wrap_content"
151+
android:layout_height="wrap_content"
152+
android:text="@string/option21" />
128153
</LinearLayout>
129154

130155
</LinearLayout>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
<item android:id="@+id/option13" android:title="@string/option13" android:titleCondensed="@string/option13"></item>
1515
<item android:id="@+id/option14" android:title="@string/option14" android:titleCondensed="@string/option14"></item>
1616
<item android:id="@+id/option15" android:title="@string/option15" android:titleCondensed="@string/option15"></item>
17-
<item android:id="@+id/option16" android:title="@string/option16" android:titleCondensed="@string/option16"></item>
18-
<item android:id="@+id/option17" android:title="@string/option17" android:titleCondensed="@string/option17"></item>
19-
<item android:id="@+id/option18" android:title="@string/option18" android:titleCondensed="@string/option18"></item>
20-
</menu>
17+
<item android:id="@+id/option16" android:title="@string/option16" android:titleCondensed="@string/option16"></item>
18+
<item android:id="@+id/option17" android:title="@string/option17" android:titleCondensed="@string/option17"></item>
19+
<item android:id="@+id/option18" android:title="@string/option18" android:titleCondensed="@string/option18"></item>
20+
<item android:id="@+id/option19" android:title="@string/option19" android:titleCondensed="@string/option19"></item>
21+
<item android:id="@+id/option20" android:title="@string/option20" android:titleCondensed="@string/option20"></item>
22+
<item android:id="@+id/option21" android:title="@string/option21" android:titleCondensed="@string/option21"></item>
23+
</menu>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
43
<string name="app_name">PubnubExample</string>
54
<string name="pubnub">Pubnub</string>
65
<string name="hello_world">Hello world!</string>
@@ -35,9 +34,9 @@
3534
<string name="option14">Set Subscribe Timeout</string>
3635
<string name="option15">Set Non Subscribe Timeout</string>
3736
<string name="option16">Set Window Interval</string>
38-
<string name="option17">Acquire Partial Wake Lock</string>
39-
<string name="option18">Release Partial Wake Lock</string>
40-
<string name="option19">Check Wake Lock Status</string>
41-
42-
43-
</resources>
37+
<string name="option17">Set Origin</string>
38+
<string name="option18">Set Domain</string>
39+
<string name="option19">Toggle Cache Busting</string>
40+
<string name="option20">Set Presence Expiry</string>
41+
<string name="option21">Set UUID</string>
42+
</resources>

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

Lines changed: 87 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import android.content.IntentFilter;
1515
import android.net.ConnectivityManager;
1616
import android.os.Bundle;
17-
import android.os.PowerManager;
1817
import android.text.InputType;
1918
import android.util.Log;
2019
import android.view.Menu;
@@ -35,7 +34,6 @@ public class MainActivity extends Activity {
3534
*/
3635

3736
Pubnub pubnub = new Pubnub("demo", "demo", "", false);
38-
PowerManager.WakeLock wl = null;
3937

4038
private void notifyUser(Object message) {
4139
try {
@@ -90,8 +88,6 @@ public void onReceive(Context arg0, Intent intent) {
9088
}
9189

9290
}, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
93-
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
94-
wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "PubnubDemoConsole");
9591

9692
}
9793

@@ -170,36 +166,105 @@ public boolean onOptionsItemSelected(MenuItem item) {
170166

171167
case R.id.option16:
172168
setWindowInterval();
173-
acquirePartialWakeLock();
174169
return true;
175-
176170
case R.id.option17:
177-
releasePartialWakeLock();
171+
setOrigin();
178172
return true;
179-
180173
case R.id.option18:
181-
checkWakeLockStatus();
174+
setDomain();
175+
return true;
176+
case R.id.option19:
177+
toggleCacheBusting();
178+
return true;
179+
case R.id.option20:
180+
setPnExpires();
181+
return true;
182+
case R.id.option21:
183+
setUUID();
182184
return true;
183185
default:
184186
return super.onOptionsItemSelected(item);
185187
}
186188
}
187189

188-
private void checkWakeLockStatus() {
189-
notifyUser("Partial Wake Lock : " + wl.isHeld());
190-
}
190+
private void setPnExpires() {
191+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
192+
builder.setTitle("Set Presence Expiry");
193+
builder.setMessage("Enter timeout value in seconds");
194+
final EditText edTimeout = new EditText(this);
195+
edTimeout.setInputType(InputType.TYPE_CLASS_NUMBER);
196+
builder.setView(edTimeout);
197+
builder.setPositiveButton("Done",
198+
new DialogInterface.OnClickListener() {
199+
@Override
200+
public void onClick(DialogInterface dialog, int which) {
201+
pubnub.setPnExpires(Integer.parseInt(edTimeout.getText().toString()));
202+
}
203+
});
204+
AlertDialog alert = builder.create();
205+
alert.show();
206+
207+
}
191208

192-
private void releasePartialWakeLock() {
193-
if (wl != null) wl.release();
194-
notifyUser("Partial Wake Lock : " + wl.isHeld());
195-
}
209+
private void toggleCacheBusting() {
210+
pubnub.setCacheBusting(pubnub.getCacheBusting() ? false : true);
211+
notifyUser("CACHE BUSTING : " + pubnub.getCacheBusting());
212+
213+
}
196214

197-
private void acquirePartialWakeLock() {
198-
if (wl != null) wl.acquire();
199-
notifyUser("Partial Wake Lock : " + wl.isHeld());
200-
}
215+
private void setOrigin() {
216+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
217+
builder.setTitle("Set Origin");
218+
builder.setMessage("Enter Origin");
219+
final EditText edTimetoken = new EditText(this);
220+
builder.setView(edTimetoken);
221+
builder.setPositiveButton("Done",
222+
new DialogInterface.OnClickListener() {
223+
@Override
224+
public void onClick(DialogInterface dialog, int which) {
225+
pubnub.setOrigin(
226+
edTimetoken.getText().toString());
227+
}
228+
});
229+
AlertDialog alert = builder.create();
230+
alert.show();
231+
}
232+
private void setDomain() {
233+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
234+
builder.setTitle("Set Domain");
235+
builder.setMessage("Enter Domain");
236+
final EditText edTimetoken = new EditText(this);
237+
builder.setView(edTimetoken);
238+
builder.setPositiveButton("Done",
239+
new DialogInterface.OnClickListener() {
240+
@Override
241+
public void onClick(DialogInterface dialog, int which) {
242+
pubnub.setDomain(
243+
edTimetoken.getText().toString());
244+
}
245+
});
246+
AlertDialog alert = builder.create();
247+
alert.show();
248+
}
249+
private void setUUID() {
250+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
251+
builder.setTitle("Set UUID");
252+
builder.setMessage("Enter UUID");
253+
final EditText edTimetoken = new EditText(this);
254+
builder.setView(edTimetoken);
255+
builder.setPositiveButton("Done",
256+
new DialogInterface.OnClickListener() {
257+
@Override
258+
public void onClick(DialogInterface dialog, int which) {
259+
pubnub.setUUID(
260+
edTimetoken.getText().toString());
261+
}
262+
});
263+
AlertDialog alert = builder.create();
264+
alert.show();
265+
}
201266

202-
private void setNonSubscribeTimeout() {
267+
private void setNonSubscribeTimeout() {
203268

204269
AlertDialog.Builder builder = new AlertDialog.Builder(this);
205270
builder.setTitle("Set Non Subscribe Timeout");
@@ -346,7 +411,7 @@ public void onClick(DialogInterface dialog, int which) {
346411
if (args.get("message") == null) {
347412
args.put("message", message);
348413
}
349-
414+
350415
// Publish Message
351416

352417
args.put("channel", channel); // Channel Name
@@ -528,7 +593,6 @@ private void presenceUnsubscribe() {
528593
public void onClick(DialogInterface dialog, int which) {
529594
String channel = input.getText().toString();
530595
pubnub.unsubscribePresence(channel);
531-
532596
}
533597
});
534598
AlertDialog alert = builder.create();

0 commit comments

Comments
 (0)