Skip to content

Commit ac6b824

Browse files
marceloinaciomarceloinacio
committed
Merge branch 'develop'
2 parents 57030ef + a172eda commit ac6b824

File tree

238 files changed

+1187
-930
lines changed

Some content is hidden

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

238 files changed

+1187
-930
lines changed

‎.pubnub.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
name: java
2-
version: 4.6.0
2+
version: 4.6.1
33
schema: 1
44
scm: github.com/pubnub/java
55
changelog:
6+
- version: v4.6.1
7+
date:
8+
changes:
9+
- type: bug
10+
text: SDK crash in Android with Airplane Mode
11+
- type: feature
12+
text: add deltas on interval action.
613
- version: v4.6.0
714
date:
815
changes:

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11

2+
## [v4.6.1](https://github.com/pubnub/java/tree/v4.6.1)
3+
4+
5+
[Full Changelog](https://github.com/pubnub/java/compare/v4.6.0...v4.6.1)
6+
7+
8+
9+
- 🐛SDK crash in Android with Airplane Mode
10+
- 🌟add deltas on interval action.
11+
12+
13+
14+
215
## [v4.6.0](https://github.com/pubnub/java/tree/v4.6.0)
316

417

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id 'findbugs'
1111
}
1212
group = 'com.pubnub'
13-
version = '4.6.0'
13+
version = '4.6.1'
1414

1515
description = """"""
1616

‎docs/allclasses-frame.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:09 BRT 2017 -->
6-
<title>All Classes (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:57 EDT 2017 -->
6+
<title>All Classes (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎docs/allclasses-noframe.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:09 BRT 2017 -->
6-
<title>All Classes (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:57 EDT 2017 -->
6+
<title>All Classes (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎docs/com/pubnub/api/PNConfiguration.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:08 BRT 2017 -->
6-
<title>PNConfiguration (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:53 EDT 2017 -->
6+
<title>PNConfiguration (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PNConfiguration (pubnub-gson 4.6.0 API)";
15+
parent.document.title="PNConfiguration (pubnub-gson 4.6.1 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNub.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:08 BRT 2017 -->
6-
<title>PubNub (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6+
<title>PubNub (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNub (pubnub-gson 4.6.0 API)";
15+
parent.document.title="PubNub (pubnub-gson 4.6.1 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubError.PubNubErrorBuilder.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:08 BRT 2017 -->
6-
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6+
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.0 API)";
15+
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.1 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubError.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:08 BRT 2017 -->
6-
<title>PubNubError (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6+
<title>PubNubError (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubError (pubnub-gson 4.6.0 API)";
15+
parent.document.title="PubNubError (pubnub-gson 4.6.1 API)";
1616
}
1717
}
1818
catch(err) {

‎docs/com/pubnub/api/PubNubException.PubNubExceptionBuilder.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_111) on Sun Mar 12 11:42:08 BRT 2017 -->
6-
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.0 API)</title>
7-
<meta name="date" content="2017-03-12">
5+
<!-- Generated by javadoc (1.8.0_102) on Tue Apr 04 22:11:54 EDT 2017 -->
6+
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.1 API)</title>
7+
<meta name="date" content="2017-04-04">
88
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../script.js"></script>
1010
</head>
1111
<body>
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.0 API)";
15+
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.1 API)";
1616
}
1717
}
1818
catch(err) {

0 commit comments

Comments
 (0)