* The default options are specified in {@link MqttConnectOptions} class.
*
- *
+ *
* @throws MqttException
* for any connected problems
* @return token used to track and wait for the connect to complete. The
@@ -313,14 +313,14 @@ public IMqttToken connect() throws MqttException {
return connect(null, null);
}
-
+
/**
* Connects to an MQTT server using the provided connect options.
*
* The connection will be established using the options specified in the
* {@link MqttConnectOptions} parameter.
*
- *
+ *
* @param options
* a set of connection parameters that override the defaults.
* @throws MqttException
@@ -339,7 +339,7 @@ public IMqttToken connect(MqttConnectOptions options) throws MqttException {
*
* The default options are specified in {@link MqttConnectOptions} class.
*
- *
+ *
* @param userContext
* optional object used to pass context to the callback. Use null
* if not required.
@@ -377,7 +377,7 @@ public IMqttToken connect(Object userContext, IMqttActionListener callback)
*
* Provides an optimized way to subscribe to multiple topics compared to
* subscribing to each one individually.
*
- *
+ *
* @param topic
* one or more topics to subscribe to, which can include
* wildcards
@@ -867,7 +867,7 @@ public IMqttToken subscribe(String topic, int qos) throws MqttException,
* for security related problems
* @throws MqttException
* for non security related problems
- *
+ *
* @see #subscribe(String[], int[], Object, IMqttActionListener)
*/
@Override
@@ -878,7 +878,7 @@ public IMqttToken subscribe(String[] topic, int[] qos)
/**
* Subscribe to a topic, which may include wildcards.
- *
+ *
* @param topic
* the topic to subscribe to, which can include wildcards.
* @param qos
@@ -897,7 +897,7 @@ public IMqttToken subscribe(String[] topic, int[] qos)
* token will be passed to callback methods if set.
* @throws MqttException
* if there was an error when registering the subscription.
- *
+ *
* @see #subscribe(String[], int[], Object, IMqttActionListener)
*/
@Override
@@ -943,7 +943,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* the client connects with the
* The "topic filter" string is used when subscription may contain special
* characters, which allows you to subscribe to multiple topics at once.
@@ -953,7 +953,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* tree and provide a hierarchical structure to the topic space. The use of
* the topic level separator is significant when the two wildcard characters
* are encountered in topics specified by subscribers.
- *
+ *
*
*
@@ -974,7 +974,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* # represents zero levels. The topic level separator is
* meaningless in this context, because there are no levels to separate.
*
- *
+ *
*
* The multi-level wildcard can be specified only on its own or
* next to the topic level separator character. Therefore, # and
@@ -984,7 +984,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* finance/#/closingprice is not valid.
*
*
- *
+ *
*
*
@@ -995,7 +995,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* wildcard matches only a single level, finance/+ does not match
* finance.
*
- *
+ *
*
* Use the single-level wildcard at any level in the topic tree, and in
* conjunction with the multilevel wildcard. Specify the single-level
@@ -1017,7 +1017,7 @@ public IMqttToken subscribe(String topic, int qos, Object userContext,
* or
*
Passing in a callback {@link IMqttActionListener} to this method
*
- *
+ *
* @param topic
* one or more topics to subscribe to, which can include
* wildcards
@@ -1049,7 +1049,7 @@ public IMqttToken subscribe(String[] topic, int[] qos, Object userContext,
mqttService.subscribe(clientHandle, topic, qos, null, activityToken);
return token;
}
-
+
/**
* Subscribe to a topic, which may include wildcards.
*
@@ -1090,11 +1090,11 @@ public IMqttToken subscribe(String topicFilter, int qos, Object userContext, IMq
* @throws MqttException if there was an error registering the subscription.
*/
public IMqttToken subscribe(String topicFilter, int qos, IMqttMessageListener messageListener) throws MqttException {
-
+
return subscribe(topicFilter, qos, null, null, messageListener);
}
-
+
/**
* Subscribe to multiple topics, each of which may include wildcards.
*
@@ -1114,7 +1114,7 @@ public IMqttToken subscribe(String topicFilter, int qos, IMqttMessageListener me
* @throws MqttException if there was an error registering the subscription.
*/
public IMqttToken subscribe(String[] topicFilters, int[] qos, IMqttMessageListener[] messageListeners) throws MqttException {
-
+
return subscribe(topicFilters, qos, null, null, messageListeners);
}
@@ -1152,7 +1152,7 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
/**
* Requests the server unsubscribe the client from a topic.
- *
+ *
* @param topic
* the topic to unsubscribe from. It must match a topic specified
* on an earlier subscribe.
@@ -1160,7 +1160,7 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
* token will be passed to callback methods if set.
* @throws MqttException
* if there was an error unregistering the subscription.
- *
+ *
* @see #unsubscribe(String[], Object, IMqttActionListener)
*/
@Override
@@ -1170,7 +1170,7 @@ public IMqttToken unsubscribe(String topic) throws MqttException {
/**
* Requests the server to unsubscribe the client from one or more topics.
- *
+ *
* @param topic
* one or more topics to unsubscribe from. Each topic must match
* one specified on an earlier subscription.
@@ -1178,7 +1178,7 @@ public IMqttToken unsubscribe(String topic) throws MqttException {
* token will be passed to callback methods if set.
* @throws MqttException
* if there was an error unregistering the subscription.
- *
+ *
* @see #unsubscribe(String[], Object, IMqttActionListener)
*/
@Override
@@ -1188,7 +1188,7 @@ public IMqttToken unsubscribe(String[] topic) throws MqttException {
/**
* Requests the server to unsubscribe the client from a topics.
- *
+ *
* @param topic
* the topic to unsubscribe from. It must match a topic specified
* on an earlier subscribe.
@@ -1202,7 +1202,7 @@ public IMqttToken unsubscribe(String[] topic) throws MqttException {
* token will be passed to callback methods if set.
* @throws MqttException
* if there was an error unregistering the subscription.
- *
+ *
* @see #unsubscribe(String[], Object, IMqttActionListener)
*/
@Override
@@ -1237,7 +1237,7 @@ public IMqttToken unsubscribe(String topic, Object userContext,
* or
* Passing in a callback {@link IMqttActionListener} to this method
*
- *
+ *
* @param topic
* one or more topics to unsubscribe from. Each topic must match
* one specified on an earlier subscription.
@@ -1277,7 +1277,7 @@ public IMqttToken unsubscribe(String[] topic, Object userContext,
* state to be remembered the client must connect with cleanSession set to
* false
*
- *
+ *
* @return zero or more delivery tokens
*/
@Override
@@ -1302,10 +1302,10 @@ public IMqttDeliveryToken[] getPendingDeliveryTokens() {
* from each non-blocking method or using setting a
* {@link IMqttActionListener} on the non-blocking method.
*
- *
+ *
* @param callback
* which will be invoked for certain asynchronous events
- *
+ *
* @see MqttCallback
*/
@Override
@@ -1313,11 +1313,11 @@ public void setCallback(MqttCallback callback) {
this.callback = callback;
}
-
+
/**
* identify the callback to be invoked when making tracing calls back into
* the Activity
- *
+ *
* @param traceCallback handler
*/
public void setTraceCallback(MqttTraceHandler traceCallback) {
@@ -1327,18 +1327,18 @@ public void setTraceCallback(MqttTraceHandler traceCallback) {
/**
* turn tracing on and off
- *
+ *
* @param traceEnabled
* set true to enable trace, otherwise, set
* false to disable trace
- *
+ *
*/
public void setTraceEnabled(boolean traceEnabled) {
this.traceEnabled = traceEnabled;
if (mqttService !=null)
mqttService.setTraceEnabled(traceEnabled);
}
-
+
/**
*
* Process incoming Intent objects representing the results of operations
@@ -1395,7 +1395,7 @@ else if (MqttServiceConstants.DISCONNECT_ACTION.equals(action)) {
else if (MqttServiceConstants.TRACE_ACTION.equals(action)) {
traceAction(data);
}else{
- mqttService.traceError(MqttService.TAG, "Callback action doesn't exist.");
+ mqttService.traceError(MqttService.TAG, "Callback action doesn't exist.");
}
}
@@ -1403,7 +1403,7 @@ else if (MqttServiceConstants.TRACE_ACTION.equals(action)) {
/**
* Acknowledges a message received on the
* {@link MqttCallback#messageArrived(String, MqttMessage)}
- *
+ *
* @param messageId
* the messageId received from the MqttMessage (To access this
* field you need to cast {@link MqttMessage} to
@@ -1418,24 +1418,24 @@ public boolean acknowledgeMessage(String messageId) {
return false;
}
-
+
public void messageArrivedComplete(int messageId, int qos) throws MqttException {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
-
+
public void setManualAcks(boolean manualAcks) {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
/**
* Process the results of a connection
- *
+ *
* @param data
*/
private void connectAction(Bundle data) {
IMqttToken token = connectToken;
removeMqttToken(data);
-
+
simpleAction(token, data);
}
@@ -1443,7 +1443,7 @@ private void connectAction(Bundle data) {
/**
* Process a notification that we have disconnected
- *
+ *
* @param data
*/
private void disconnected(Bundle data) {
@@ -1459,7 +1459,7 @@ private void disconnected(Bundle data) {
/**
* Process a Connection Lost notification
- *
+ *
* @param data
*/
private void connectionLostAction(Bundle data) {
@@ -1483,7 +1483,7 @@ private void connectExtendedAction(Bundle data){
/**
* Common processing for many notifications
- *
+ *
* @param token
* the token associated with the action being undertake
* @param data
@@ -1501,13 +1501,13 @@ private void simpleAction(IMqttToken token, Bundle data) {
((MqttTokenAndroid) token).notifyFailure(exceptionThrown);
}
} else {
- mqttService.traceError(MqttService.TAG, "simpleAction : token is null");
+ mqttService.traceError(MqttService.TAG, "simpleAction : token is null");
}
}
/**
* Process notification of a publish(send) operation
- *
+ *
* @param data
*/
private void sendAction(Bundle data) {
@@ -1518,7 +1518,7 @@ private void sendAction(Bundle data) {
/**
* Process notification of a subscribe operation
- *
+ *
* @param data
*/
private void subscribeAction(Bundle data) {
@@ -1528,7 +1528,7 @@ private void subscribeAction(Bundle data) {
/**
* Process notification of an unsubscribe operation
- *
+ *
* @param data
*/
private void unSubscribeAction(Bundle data) {
@@ -1538,7 +1538,7 @@ private void unSubscribeAction(Bundle data) {
/**
* Process notification of a published message having been delivered
- *
+ *
* @param data
*/
private void messageDeliveredAction(Bundle data) {
@@ -1556,7 +1556,7 @@ private void messageDeliveredAction(Bundle data) {
/**
* Process notification of a message's arrival
- *
+ *
* @param data
*/
private void messageArrivedAction(Bundle data) {
@@ -1585,10 +1585,10 @@ private void messageArrivedAction(Bundle data) {
}
}
}
-
+
/**
* Process trace action - pass trace data back to the callback
- *
+ *
* @param data
*/
private void traceAction(Bundle data) {
@@ -1597,9 +1597,9 @@ private void traceAction(Bundle data) {
String severity = data.getString(MqttServiceConstants.CALLBACK_TRACE_SEVERITY);
String message = data.getString(MqttServiceConstants.CALLBACK_ERROR_MESSAGE);
String tag = data.getString(MqttServiceConstants.CALLBACK_TRACE_TAG);
- if (MqttServiceConstants.TRACE_DEBUG.equals(severity))
+ if (MqttServiceConstants.TRACE_DEBUG.equals(severity))
traceCallback.traceDebug(tag, message);
- else if (MqttServiceConstants.TRACE_ERROR.equals(severity))
+ else if (MqttServiceConstants.TRACE_ERROR.equals(severity))
traceCallback.traceError(tag, message);
else
{
@@ -1608,7 +1608,7 @@ else if (MqttServiceConstants.TRACE_ERROR.equals(severity))
}
}
}
-
+
/**
* @param token
* identifying an operation
@@ -1622,12 +1622,12 @@ private synchronized String storeToken(IMqttToken token) {
/**
* Get a token identified by a string, and remove it from our map
- *
+ *
* @param data
* @return the token
*/
private synchronized IMqttToken removeMqttToken(Bundle data) {
-
+
String activityToken = data.getString(MqttServiceConstants.CALLBACK_ACTIVITY_TOKEN);
if (activityToken!=null){
int tokenNumber = Integer.parseInt(activityToken);
@@ -1640,7 +1640,7 @@ private synchronized IMqttToken removeMqttToken(Bundle data) {
/**
* Get a token identified by a string, and remove it from our map
- *
+ *
* @param data
* @return the token
*/
@@ -1669,14 +1669,14 @@ public MqttMessage getBufferedMessage(int bufferIndex){
public void deleteBufferedMessage(int bufferIndex){
mqttService.deleteBufferedMessage(clientHandle, bufferIndex);
}
-
+
/**
* Get the SSLSocketFactory using SSL key store and password
*
* A convenience method, which will help user to create a SSLSocketFactory
* object
*
- *
+ *
* @param keyStore
* the SSL key store which is generated by some SSL key tool,
* such as keytool in Java JDK
@@ -1693,17 +1693,17 @@ public SSLSocketFactory getSSLSocketFactory (InputStream keyStore, String passwo
SSLContext ctx = null;
SSLSocketFactory sslSockFactory=null;
KeyStore ts;
- ts = KeyStore.getInstance("BKS");
+ ts = KeyStore.getInstance("BKS");
ts.load(keyStore, password.toCharArray());
TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
tmf.init(ts);
TrustManager[] tm = tmf.getTrustManagers();
ctx = SSLContext.getInstance("TLSv1");
ctx.init(null, tm, null);
-
+
sslSockFactory=ctx.getSocketFactory();
return sslSockFactory;
-
+
} catch (KeyStoreException | CertificateException | IOException | NoSuchAlgorithmException | KeyManagementException e) {
throw new MqttSecurityException(e);
}
@@ -1713,18 +1713,18 @@ public SSLSocketFactory getSSLSocketFactory (InputStream keyStore, String passwo
public void disconnectForcibly() throws MqttException {
throw new UnsupportedOperationException();
}
-
+
@Override
public void disconnectForcibly(long disconnectTimeout) throws MqttException {
throw new UnsupportedOperationException();
}
-
+
@Override
public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout)
throws MqttException {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
-
+
/**
* Unregister receiver which receives intent from MqttService avoids
* IntentReceiver leaks.
@@ -1745,11 +1745,11 @@ public void unregisterResources(){
}
}
}
-
+
/**
* Register receiver to receiver intent from MqttService. Call this method
* when activity is hidden and become to show again.
- *
+ *
* @param context
* - Current activity context.
*/
From 190b902c501366038e4a767da7dc9c0dfad9525d Mon Sep 17 00:00:00 2001
From: inder
Date: Wed, 6 Jul 2022 13:16:30 +0530
Subject: [PATCH 06/10] fix : added SCHEDULE_EXACT_ALARM permission
---
.../src/main/AndroidManifest.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/org.eclipse.paho.android.service/src/main/AndroidManifest.xml b/org.eclipse.paho.android.service/src/main/AndroidManifest.xml
index b1c079cb8..ba0b4ae08 100755
--- a/org.eclipse.paho.android.service/src/main/AndroidManifest.xml
+++ b/org.eclipse.paho.android.service/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
-
+
+
From 24cb3153edd04621a5fe735da3c9778682682ce1 Mon Sep 17 00:00:00 2001
From: inder
Date: Tue, 12 Jul 2022 13:56:03 +0530
Subject: [PATCH 07/10] fix : publish mqtt to jitpack
---
build.gradle | 6 ++--
jitpack.yml | 4 +++
org.eclipse.paho.android.service/build.gradle | 34 +++++++++----------
3 files changed, 24 insertions(+), 20 deletions(-)
create mode 100644 jitpack.yml
diff --git a/build.gradle b/build.gradle
index 289096421..ae26cb706 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,10 @@ ext{
group = 'org.eclipse.paho'
sampleArchivesBaseName = 'org.eclipse.paho.android.sample'
- sampleVersion = '1.1.2'
+ sampleVersion = '1.1.3'
- serviceArchivesBaseName = 'org.eclipse.paho.android.service'
- serviceVersion = '1.1.2'
+ serviceArchivesBaseName = 'inder.paho.mqtt'
+ serviceVersion = '1.1.3'
clientVersion = '1.1.0'
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 000000000..faa03d22f
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,4 @@
+jdk:
+ - openjdk11
+before_install:
+ - ./scripts/prepareJitpackEnvironment.sh
diff --git a/org.eclipse.paho.android.service/build.gradle b/org.eclipse.paho.android.service/build.gradle
index 566c6bcca..fd0a44061 100755
--- a/org.eclipse.paho.android.service/build.gradle
+++ b/org.eclipse.paho.android.service/build.gradle
@@ -94,29 +94,29 @@ task("generateJavaDocJar", type: Jar, dependsOn: (rootProject.ext.serviceVersion
publishing {
publications {
paho(MavenPublication) {
- groupId 'org.eclipse.paho'
+ groupId 'inderrapido'
artifact generateSourcesJar
artifact generateLibraryJar
artifact generateJavaDocJar
artifact "$buildDir/outputs/aar/" + rootProject.ext.serviceArchivesBaseName + "-" + rootProject.ext.serviceVersion + ".aar"
}
}
- repositories {
- if (project.hasProperty('eclipseRepoUsername')) {
- maven {
- name 'eclipse'
- url 'https://repo.eclipse.org/content/repositories/paho-' + (rootProject.ext.serviceVersion.endsWith('-SNAPSHOT') ? 'snapshots/' : 'releases/')
- credentials {
- username eclipseRepoUsername
- password eclipseRepoPassword
- }
- }
- } else {
- maven {
- url "$buildDir/repo"
- }
- }
- }
+// repositories {
+// if (project.hasProperty('eclipseRepoUsername')) {
+// maven {
+// name 'eclipse'
+// url 'https://repo.eclipse.org/content/repositories/paho-' + (rootProject.ext.serviceVersion.endsWith('-SNAPSHOT') ? 'snapshots/' : 'releases/')
+// credentials {
+// username eclipseRepoUsername
+// password eclipseRepoPassword
+// }
+// }
+// } else {
+// maven {
+// url "$buildDir/repo"
+// }
+// }
+// }
}
From 6f526719674b05ed4334cc08b1dbf306daa7aa3a Mon Sep 17 00:00:00 2001
From: inder
Date: Tue, 12 Jul 2022 15:29:50 +0530
Subject: [PATCH 08/10] fix : fix build issue
---
build.gradle | 4 ++--
org.eclipse.paho.android.sample/build.gradle | 16 ++++++++--------
org.eclipse.paho.android.service/build.gradle | 6 +++---
paho.mqtt.android.example/build.gradle | 16 ++++++++--------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/build.gradle b/build.gradle
index ae26cb706..f21541ea7 100755
--- a/build.gradle
+++ b/build.gradle
@@ -20,11 +20,11 @@ ext{
group = 'org.eclipse.paho'
- sampleArchivesBaseName = 'org.eclipse.paho.android.sample'
+ sampleArchivesBaseName = 'inder.paho.mqtt'
sampleVersion = '1.1.3'
serviceArchivesBaseName = 'inder.paho.mqtt'
- serviceVersion = '1.1.3'
+ serviceVersion = '1.1.4'
clientVersion = '1.1.0'
diff --git a/org.eclipse.paho.android.sample/build.gradle b/org.eclipse.paho.android.sample/build.gradle
index b12488bd1..2e509d6ae 100644
--- a/org.eclipse.paho.android.sample/build.gradle
+++ b/org.eclipse.paho.android.sample/build.gradle
@@ -32,13 +32,13 @@ repositories {
dependencies {
- //compile fileTree(dir: '../org.eclipse.paho.android/service/libs', excludes: ["org.eclipse.paho.client.mqttv3-${rootProject.ext.clientVersion}.jar"], include: '')
- compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
- compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
- compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
- compile (project(':org.eclipse.paho.android.service')){
- //exclude module: "org.eclipse.paho.client.mqttv3"
- transitive=true
+ implementation fileTree(dir: '../org.eclipse.paho.android/service/libs', include: '')
+ implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+ implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+ implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
+ implementation(project(':org.eclipse.paho.android.service')){
+ // exclude module: "org.eclipse.paho.client.mqttv3"
+ //transitive=true
}
}
@@ -48,7 +48,7 @@ task publishAPK(type: Copy) {
}
-configurations.compile.exclude module: 'org.eclipse.paho.client.mqttv3'
+//configurations.compile.exclude module: 'org.eclipse.paho.client.mqttv3'
task debug doLast {
configurations.compile.each { println it}
}
diff --git a/org.eclipse.paho.android.service/build.gradle b/org.eclipse.paho.android.service/build.gradle
index fd0a44061..40d3f3de0 100755
--- a/org.eclipse.paho.android.service/build.gradle
+++ b/org.eclipse.paho.android.service/build.gradle
@@ -36,9 +36,9 @@ configurations {
}
dependencies {
- compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
- compile "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
- compile fileTree(include: ['*.jar'], dir: 'libs')
+ api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
+ api "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+ api fileTree(include: ['*.jar'], dir: 'libs')
}
android.libraryVariants.all { variant ->
diff --git a/paho.mqtt.android.example/build.gradle b/paho.mqtt.android.example/build.gradle
index 3f4b40900..0387cbb33 100644
--- a/paho.mqtt.android.example/build.gradle
+++ b/paho.mqtt.android.example/build.gradle
@@ -31,19 +31,19 @@ repositories {
dependencies {
- compile fileTree(dir: 'libs', excludes: ["org.eclipse.paho.client.mqttv3-${rootProject.ext.clientVersion}.jar"], include: '*.jar')
- testCompile 'junit:junit:4.12'
- compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
- compile "com.android.support:design:${rootProject.ext.supportLibVersion}"
- compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
- compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
- compile (project(':org.eclipse.paho.android.service')){
+ implementation fileTree(dir: 'libs', include: '*.jar')
+ testImplementation 'junit:junit:4.12'
+ implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+ implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+ implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+ implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
+ implementation(project(':org.eclipse.paho.android.service')){
//exclude module: "org.eclipse.paho.client.mqttv3"
transitive=true
}
}
-configurations.compile.exclude module: 'org.eclipse.paho.client.mqttv3'
+//configurations.compile.exclude module: 'org.eclipse.paho.client.mqttv3'
task debug doLast {
configurations.compile.each { println it}
}
From a9b1269af624ac2587178d28821f3e7270d12952 Mon Sep 17 00:00:00 2001
From: inder
Date: Tue, 12 Jul 2022 16:01:32 +0530
Subject: [PATCH 09/10] fix : fix aar build issue
---
org.eclipse.paho.android.service/build.gradle | 3 ---
1 file changed, 3 deletions(-)
diff --git a/org.eclipse.paho.android.service/build.gradle b/org.eclipse.paho.android.service/build.gradle
index 40d3f3de0..a375b2262 100755
--- a/org.eclipse.paho.android.service/build.gradle
+++ b/org.eclipse.paho.android.service/build.gradle
@@ -95,9 +95,6 @@ publishing {
publications {
paho(MavenPublication) {
groupId 'inderrapido'
- artifact generateSourcesJar
- artifact generateLibraryJar
- artifact generateJavaDocJar
artifact "$buildDir/outputs/aar/" + rootProject.ext.serviceArchivesBaseName + "-" + rootProject.ext.serviceVersion + ".aar"
}
}
From 94607277ed246a22f6b3e57075f8cfd76b1b9480 Mon Sep 17 00:00:00 2001
From: inder
Date: Thu, 8 Dec 2022 16:18:29 +0530
Subject: [PATCH 10/10] Fix:Invalid client handle issue
---
.../org/eclipse/paho/android/service/MqttAndroidClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java b/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java
index bce435a4c..7a94eb321 100755
--- a/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java
+++ b/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java
@@ -467,7 +467,7 @@ private void doConnect() {
mqttService.connect(clientHandle, connectOptions, null,
activityToken);
}
- catch (MqttException | IllegalStateException e) {
+ catch (MqttException | IllegalStateException | IllegalArgumentException e) {
IMqttActionListener listener = connectToken.getActionCallback();
if (listener != null) {
listener.onFailure(connectToken, e);