Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #410

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f072bb5
Remove unnecessary `throws` declarations
paulo-raca Jan 15, 2017
3594ba8
Remove unnecessary tr-catch blocks on the example code
paulo-raca Jan 15, 2017
b44e691
Issue #169 - Adding null check on mqttService close, updating gradle …
jpwsutton Jan 24, 2017
ad6dc1c
Alert if messageArrivedAction fails.
jpwsutton Jan 25, 2017
f1768ae
Alert if messageArrivedAction fails. (#173)
jpwsutton Jan 25, 2017
9c6451b
Updating to version: 1.1.2-SNAPSHOT, adding master release pom for fu…
jpwsutton Jan 31, 2017
7dd6d2a
Merge pull request #175 from jpwsutton/develop
jpwsutton Jan 31, 2017
3e492e2
Merge pull request #155 from paulo-raca/nothrows
jpwsutton Feb 13, 2017
7e4290e
Move ping request to AsyncTask
miketran78727 Mar 21, 2017
feb63cc
Merge pull request #191 from miketran78727/pingsender-anr-fix-2
jpwsutton Mar 23, 2017
62c90ac
Updating SDK and build tools to v25
jpwsutton Mar 28, 2017
8968559
Updating Java client version to 1.1.2-SNAPSHOT
jpwsutton Mar 28, 2017
4036aca
update to most recent Gradle build tools 2.3
hannesa2 Aug 6, 2017
13bd7db
Merge pull request #229 from hannesa2/updateToMostRecentGradle_2.3
jpwsutton Sep 7, 2017
640f6c9
support sessionPresent on connack (#222)
Sep 7, 2017
80eb7f2
Merging PR #245 into develop branch
blundell Oct 4, 2017
358ff48
Updating requirements in travis build for new android SDK
jpwsutton Oct 4, 2017
fc4a694
update to AndroidStudio 3 release (#255)
hannesa2 Oct 31, 2017
f9e0e0c
Thow Invalid Argument Exception when getConnection is called with a n…
jpwsutton Nov 15, 2017
301a450
Changing automated tests to use local mosquitto broker and re-enablin…
jpwsutton Nov 17, 2017
3e7f602
Code formatter (#257)
hannesa2 Dec 6, 2017
1cdb0b5
Android studio 3.0.1 (#282)
hannesa2 May 9, 2018
0286a8f
Avoids ClassCastException when there are more than one service (#291)
idiazt May 9, 2018
46bc0a1
update to Android Studio 3.3.2
Tynox Mar 10, 2019
d45710b
remove pointless .gitignore files
hannesa2 Apr 5, 2020
9330f5f
update client/server to be able to compile
hannesa2 Apr 5, 2020
73f9429
simplify maven
hannesa2 Apr 5, 2020
9d1adff
Android Studio 3.6.2
hannesa2 Apr 5, 2020
0c226f7
Android Studio 3.6.3
hannesa2 May 13, 2020
df0f273
remove obsolete buildtools
hannesa2 May 13, 2020
4dd80c1
Merge pull request #403 from hannesa2/CleanupFromPointlessGitignoreDe…
icraggs Jun 4, 2020
585185f
Merge pull request #404 from hannesa2/AndroidStudio-3.6.2
icraggs Jun 4, 2020
cc5fac9
Add required Eclipse meta data files
icraggs Jan 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ gen/

# Gradle files
.gradle/
build/
/*/build/
build

# Cache of project
.gradletasknamecache
Expand All @@ -37,6 +36,7 @@ proguard/

## Directory-based project format:
.idea/
*.iml

## File-based project format:
*.ipr
Expand Down Expand Up @@ -95,3 +95,7 @@ hs_err_pid*


org.eclipse.paho.android.sample/libs/

!.idea/
.idea/*
!codeStyleSettings.xml
246 changes: 246 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 23 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
sudo: required
language: android
jdk: oraclejdk8
android:
components:
- tools
- build-tools-23.0.3
- android-24
- build-tools-28.0.3
- android-28
- android-22
- extra-android-support
- extra
- sys-img-armeabi-v7a-android-22

#before_script:
# - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
# - emulator -avd test -no-audio -no-window &
# - android-wait-for-emulator
# - adb shell input keyevent 82 &
before_install:
- ./travis-install.sh

before_script:
- android list targets
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &

script:
- ./gradlew clean
- ./gradlew org.eclipse.paho.android.sample:assemble paho.mqtt.android.example:assemble
# - ./gradlew org.eclipse.paho.android.service:assemble org.eclipse.paho.android.service:connectedCheck
- ./gradlew org.eclipse.paho.android.sample:assemble BasicExample:assemble
- ./gradlew org.eclipse.paho.android.service:assemble org.eclipse.paho.android.service:connectedCheck

addons:
apt:
sources:
- sourceline: 'ppa:mosquitto-dev/mosquitto-ppa'
packages:
- mosquitto
30 changes: 30 additions & 0 deletions BasicExample/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion

defaultConfig {
applicationId "paho.mqtt.java.example"
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
lintOptions {
abortOnError false
}

useLibrary 'android.test.runner'
useLibrary 'android.test.base'
}

dependencies {
implementation project(':org.eclipse.paho.android.service')
// implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
// implementation "org.eclipse.paho:org.eclipse.paho.android.service:${rootProject.ext.clientVersion}"
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}"

testImplementation 'junit:junit:4.13'
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="paho.mqtt.java.example">
<manifest package="paho.mqtt.java.example"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">


<!-- Permissions the Application Requires -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<!--<uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

<application
android:allowBackup="false"
Expand All @@ -25,14 +20,12 @@
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Mqtt Service -->
<service android:name="org.eclipse.paho.android.service.MqttService">
</service>

</application>

</manifest>
Loading