Skip to content

Commit fe93a2e

Browse files
author
Devendra
committed
merged TR-230, fixed conflicts
2 parents 84dbf47 + ae70308 commit fe93a2e

33 files changed

Lines changed: 1180 additions & 1164 deletions

android/Pubnub-Android-3.5.6.jar

6.54 KB
Binary file not shown.
6.54 KB
Binary file not shown.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public void onClick(DialogInterface dialog, int which) {
319319
if (args.get("message") == null) {
320320
args.put("message", message);
321321
}
322-
322+
323323
// Publish Message
324324

325325
args.put("channel", channel); // Channel Name
@@ -501,6 +501,7 @@ private void presenceUnsubscribe() {
501501
public void onClick(DialogInterface dialog, int which) {
502502
String channel = input.getText().toString();
503503
pubnub.unsubscribePresence(channel);
504+
504505
}
505506
});
506507
AlertDialog alert = builder.create();
6.54 KB
Binary file not shown.

android/src/com/pubnub/api/Pubnub.java

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*/
1212

13-
public class Pubnub extends PubnubCore {
13+
public class Pubnub extends PubnubCoreShared {
1414
/**
1515
* Pubnub Constructor
1616
*
@@ -102,43 +102,6 @@ public Pubnub(String publish_key, String subscribe_key,
102102
super(publish_key, subscribe_key, secret_key, cipher_key, ssl_on, initialization_vector);
103103
}
104104

105-
/**
106-
* Sets value for UUID
107-
*
108-
* @param uuid
109-
* UUID value for Pubnub client
110-
*/
111-
public void setUUID(UUID uuid) {
112-
this.UUID = uuid.toString();
113-
}
114-
115-
protected String uuid() {
116-
return java.util.UUID.randomUUID().toString();
117-
}
118-
119-
/**
120-
* This method sets timeout value for subscribe/presence. Default value is
121-
* 310000 milliseconds i.e. 310 seconds
122-
*
123-
* @param timeout
124-
* Timeout value in milliseconds for subscribe/presence
125-
*/
126-
public void setSubscribeTimeout(int timeout) {
127-
super.setSubscribeTimeout(timeout);
128-
}
129-
130-
/**
131-
* This method set timeout value for non subscribe operations like publish,
132-
* history, hereNow. Default value is 15000 milliseconds i.e. 15 seconds.
133-
*
134-
* @param timeout
135-
* Timeout value in milliseconds for Non subscribe operations
136-
* like publish, history, hereNow
137-
*/
138-
public void setNonSubscribeTimeout(int timeout) {
139-
super.setNonSubscribeTimeout(timeout);
140-
}
141-
142105
protected String getUserAgent() {
143106
return "(Android " + android.os.Build.VERSION.RELEASE +
144107
"; " + android.os.Build.MODEL +
85 Bytes
Binary file not shown.
457 Bytes
Binary file not shown.

j2me/Pubnub-MicroEdition-3.5.6.jar

85 Bytes
Binary file not shown.
1.38 KB
Binary file not shown.

java/doc/allclasses-frame.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--NewPage-->
33
<HTML>
44
<HEAD>
5-
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 12:04:14 IST 2013 -->
5+
<!-- Generated by javadoc (build 1.6.0_37) on Tue Dec 10 12:49:17 IST 2013 -->
66
<TITLE>
77
All Classes
88
</TITLE>

0 commit comments

Comments
 (0)