131 Commits

Author SHA1 Message Date
Dustin Thomson
3f913d2c55 Fix Bug 475639 - Added null checks
Signed-off-by: Dustin Thomson <dthomson@51systems.com>
2015-08-22 18:26:36 -06:00
James Sutton
3c8ff748e9 Bug: 473928 - ClientState.checkForActivity() does not attach callback to IMqttToken before it is placed on event queue
Created ClientComms.checkForActivity(IMqttActionListener pingCallback) to pass the callbacks through to ClientState.checkForActivity which then attaches them to the token before it is added to the tokenStore.
Also modified AlarmPingSender.onReceive to create the callbacks before requesting the token from ClientComms.checkForActivity.

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
Change-Id: I1a6a4e3cfe6bd58880e3e760d6809a80e67d45ce
2015-07-30 16:21:47 +01:00
Dustin Thomson
bbb73e29be Fix Bug 468142 - Added clientHandle null check in isConnected() to prevent NullPointerException.
Added testIsConnected unit test

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=468142
Signed-off-by: Dustin Thomson <dthomson@51systems.com>
2015-07-30 06:55:05 -04:00
Dustin Thomson
3e23c56442 Fix Bug 462619 - Added checks in connect method to not registerReceiver if it is already registered
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=462619
Signed-off-by: Dustin Thomson <dthomson@51systems.com>
2015-07-30 06:34:42 -04:00
Ian Craggs
92ca515d59 Ack control
Bug: 472172
2015-07-08 17:15:15 +01:00
Ian Craggs
a503836900 Ack control
Bug: 472172
2015-07-08 17:00:03 +01:00
Ian Craggs
fcaabd34df Add more tests for per subscription messsage handlers, and move match method to MqttTopic
Bug: 466579
2015-05-29 15:23:51 +01:00
Ian Craggs
ededde45ff Update Android interface to match MqttAsyncClient
Bug: 466579
2015-05-19 16:38:04 +01:00
Ian Craggs
d2464bc369 Hmm, need return statements! 2015-05-18 12:37:08 +01:00
Ian Craggs
50f37bb359 Add new subscribe methods to Android service class 2015-05-18 12:23:45 +01:00
Ian Craggs
527f81ae4d Update develop branch to 1.0.3-SNAPSHOT (for real!) 2015-02-16 17:19:48 +00:00
Ian Craggs
5d41630a81 Update develop branch to 1.0.3-SNAPSHOT 2015-02-16 16:57:38 +00:00
Ian Craggs
171f7f326d Update all pom.xml files to version 1.0.2 2015-02-06 12:42:03 +00:00
Ian Craggs
bf04defa35 Merge branch 'develop' of ssh://git.eclipse.org:29418/paho/org.eclipse.paho.mqtt.java into develop 2015-02-06 12:22:02 +00:00
Ian Craggs
756ad12615 Merge branch 'develop'
Conflicts:
	org.eclipse.paho.android.service/org.eclipse.paho.android.service/pom.xml
2015-02-06 12:01:36 +00:00
tzihan
e4dca9a890 Bug 455849 - Lint error: WrongManifestParent
Remove the duplicated tag of <users-permission>

Bug 455849

Change-Id: Ie6408f479c38f362db254b2bd3774bacd8eae9a8
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2015-01-15 10:45:26 +08:00
tzihan
a2d6903ff8 Bug 455849 - Lint error: WrongManifestParent
Put service tag under application tag in AndroidManifest.xml

Bug 455849

Change-Id: Id0a16975ca9468dccf330b9ca9b577f67d471631
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2015-01-06 17:14:59 +08:00
tzihan
2f1bd65f96 Fix Bug 446379 - Security issue: Paho Android Service is broadcasting all messages and events system wide
Use LocalBroadcastManager instead of system wide one.  add pom.xml to download android-support-v4 package.

 Bug 446379

Change-Id: I98dad08c69992828d9867a69027fd6f6ba6c66b8
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-12-05 14:42:38 +08:00
Al S-M
e92977be9a remove SNAPSHOT from pom.xml dependencies 2014-11-26 10:47:07 +00:00
Ian Craggs
51418e8e95 Update version numbers to 1.0.1 - service release 2014-11-18 14:27:48 +00:00
Marco Carrer
7abae32371 Fix for bug 446663. Please see bugs comments for the description.
Signed-off-by: Marco Carrer <marco.carrer@eurotech.com>
2014-10-21 15:31:41 +02:00
tzihan
dd0aa4af78 fix Bug 443371 - Refine documentation
Remove 'public' keyword from the classes which are not requried to be exposed to application.\
Add and refine comments to generate java doc.

bug 443371

Change-Id: Ic6c1cdf7674a113478f010ab79264e12478670d5
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-10-10 15:28:14 +08:00
tzihan
e6e034526d Fix bug: 443369 - Some connection status is not set appropriately
the 'disconnected' and 'isConnecting' initialized status is not set correctly.

bug:443369
Change-Id: I679eea16cff53fbb9f59b72c57686358c56b94c7
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-30 14:20:04 +08:00
tzihan
5359d4f250 Roll back the features of 443359, 443362, 443363, 443364
Roll back the following features : Reconnect after reconnect fail.
Auto connect after connect fail.
Reconnect after connection lost.
Reconnect after network recovery

Change-Id: I74ce5d564ea689deaf506a9562136f1627988e2f
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-30 14:14:19 +08:00
zyang5e4
923454f227 Fix Bug 445298 - NullPointer Exception when close SQLite db
Change-Id: If45c5f16301f24cffd55ec74876e41d171b6cfaf
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-29 09:16:25 +08:00
zyang5e4
2527a78d91 Roll back changes of Bugzilla bug 443374 and Bugzilla bug 443367
Change-Id: Icf332d2e2bedeebb6d4b2766a26b09c2ad3ba58b
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-28 11:06:29 +08:00
Al Stockdill-Mander
309de22930 Merge "bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server" into develop 2014-09-26 06:08:52 -04:00
Al Stockdill-Mander
4877ba5a17 Merge "bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server" into develop 2014-09-26 06:08:33 -04:00
tzihan
7232c55cf4 bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server
Roll back the feature. Delete the database storage which is used for persist connection meta info.

bug:443365
Change-Id: I8df65795f81c1bcc2885ce0dc0f9872416dd9379
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-26 11:34:25 +08:00
tzihan
713d45dd96 bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server
Roll back the change . Still keep the changes to MqttConnection.java, the logic help make the service more stable.

bug:44365
Change-Id: I92467f6bc32dafbf2212b7fbaef6692cd32490b7
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-26 10:51:45 +08:00
zyang5e4
6bf5741699 Fix Bug 444318 - Check null when calling MqttAndroidClient#isConnected
Change-Id: Id698850b10e0707a195e279150c1483021e0f15e
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-20 23:09:41 +08:00
Al Stockdill-Mander
353b1ea2b2 Merge "Update android service pom.xml and enable eclipse maven project nature" into develop 2014-09-19 11:05:14 -04:00
Al Stockdill-Mander
461667990f Merge "Fix bug 442921 to add maven build for MQTT android service" into develop 2014-09-19 11:05:03 -04:00
bzhangxmt
dd9e363c2c Update android service pom.xml and enable eclipse maven project nature
Able to build android service jar from eclipse maven tool.

Signed-off-by: bzhangxmt <zhbinbj@cn.ibm.com>
2014-09-19 14:46:50 +08:00
bzhangxmt
7f49dd2940 Fix bug 442921 to add maven build for MQTT android service
Added MQTT android service maven module to the main pom.xml

Bug: 442921
Signed-off-by: bzhangxmt <zhbinbj@cn.ibm.com>
2014-09-18 17:51:55 +08:00
zyang5e4
3850c7d08a Fix Bug 443374 - connection will not reconnect after connection lost if cleanSession is set to true
Change-Id: I569e490a06d2869ebb50141b98414daf18dbd238
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-18 13:30:22 +08:00
zyang5e4
c5cbd612b3 Fix Bug 443367 - [feature] mqtt service provide a callback interface to let user setup their own notification callback to notify message arrived during app is dead
Change-Id: I7b75cb6afa5e26f32ca123b38d802dfe5e229546
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-16 15:46:08 +08:00
tzihan
439cd65237 Fix bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server
Change-Id: Icd43a73cbde91e0451a905b737b7dad071c33755
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-12 15:17:17 +08:00
Al Stockdill-Mander
6345eb56c1 Merge "Reconnect issue:Persist the connection meta info in SQLite database;Delete connection info from SQLite database when call disconnect." into develop 2014-09-08 05:39:06 -04:00
tzihan
db686419d9 Reconnect issue:Persist the connection meta info in SQLite database;Delete connection info from SQLite database when call disconnect.
Change-Id: I4d530abb144d33280cf44f186b0223b0dee93d47
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-09-04 14:53:05 +08:00
zyang5e4
6d8bba504f Fix bugzilla bug 442845
Change-Id: Iae81ddf83366d72ce624bf207a1ebbea43570f67
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-09-03 15:23:51 +08:00
Al Stockdill-Mander
0b3bed3d0b Merge "fix bug for app crashed when cleansession is set to true" into develop 2014-08-29 06:11:33 -04:00
zyang5e4
c7aae8bdfe fix bug for app crashed when cleansession is set to true
Change-Id: I865d42a979c8e76398b71ee6bc51a9345c96c004
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-08-29 14:52:07 +08:00
tzihan
9f8923724a AutoReconnect issue: Reconnect after reconnect fail.
Change-Id: Ie4d020100a76559687d8c748c2d0259a4ad842e5
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-08-28 15:12:33 +08:00
tzihan
0f4e8ce7c5 AutoReconnect issue : Auto connect after connect fail.
Change-Id: Ie29afcec211f9f9c5a0bd8990c1e967421a98931
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-08-28 15:08:52 +08:00
tzihan
e08e85c5f8 AutoReconnect issue : Reconnect after connection lost.
Change-Id: I9867a0689e2e495925a7feff27149d58c159738d
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-08-28 15:02:06 +08:00
tzihan
98ac18fcaa AutoReconnect issue : Reconnect after network recovery
Change-Id: Ic2c9d25a464dcc2f2b1acbbddb8a88abf4dc0007
Signed-off-by: tzihan <zhtang@cn.ibm.com>
2014-08-28 14:22:32 +08:00
zyang5e4
bad415695e Fix bug: incorrect DB state
Change-Id: I8c70fbeba27381c30b10942aea2af2c2fe517085
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-08-04 14:04:37 +08:00
zyang5e4
2316a33fd1 Fix bug 440861: should not use == to compare string
Change-Id: Ib57cc82d5715f41b3d3cd007263873fe8c9c05c7
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-08-04 13:53:27 +08:00
zyang5e4
5f2979a679 Remove codes that wrongly added when fix previous bug
Change-Id: Ia32f49563d155b0e38675379ab07b71ecdaed218
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>
2014-07-24 17:16:08 +08:00