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

Add MQTT-Support #46

Draft
wants to merge 68 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
38db5b9
inital commit for 0.5 release
PeterHasse Oct 29, 2024
033a9f1
Add a nullguard to DetailFragment
RkShaRkz Nov 4, 2024
2beea70
Added nullguarding to QuickFragment too
RkShaRkz Nov 4, 2024
656930b
Better fix for QuickFragment
RkShaRkz Nov 4, 2024
0ee07f5
Different fix for MainActivity thread ...
RkShaRkz Nov 4, 2024
0fa3ebf
PingService - moving things off of main thread
RkShaRkz Nov 4, 2024
e7db9f6
LoggingService - moving things off of main thread
RkShaRkz Nov 4, 2024
62a0bd1
Address CR comments
RkShaRkz Nov 5, 2024
0e67484
added build information to logging
PeterHasse Nov 5, 2024
669624f
Merge remote-tracking branch 'cloudcity/upstream-main' into rel/0.5
PeterHasse Nov 5, 2024
f5fc323
Merge pull request #38 from omnt/main
PeterHasse Nov 5, 2024
a36da25
Merge branch 'rel/0.5' of github.com:omnt/OpenMobileNetworkToolkit in…
PeterHasse Nov 5, 2024
20aadaa
added githash to build information
PeterHasse Nov 6, 2024
7a88b51
added the githash to influx / log output
PeterHasse Nov 12, 2024
e5a4188
Merge pull request #44 from omnt/fix-cloud-city-ci-issue
PeterHasse Dec 17, 2024
0e4ed62
Revert "PingService - moving things off of main thread"
PeterHasse Dec 17, 2024
629bec7
bump depencies and compileSDK version (we still use an older targetSDK)
PeterHasse Dec 19, 2024
4c3ccb8
remove callback in log message
PeterHasse Dec 19, 2024
cddbde4
Update TM reference in Dataprovider instat of creating a new instance…
PeterHasse Dec 19, 2024
c533d73
dont show nullnull in quick view
PeterHasse Dec 20, 2024
ced463b
add dep for MQTT lib
hajoha Jan 5, 2025
e629b4a
add basic setup for MQTT config
hajoha Jan 5, 2025
7f7effd
add basic infrastructure for MQTT
hajoha Jan 6, 2025
81bb376
added EPDG static address configuration support
PeterHasse Jan 7, 2025
6c2c181
update changelog
PeterHasse Jan 7, 2025
5acb8a7
update depencies
PeterHasse Jan 7, 2025
c6ce469
remove double setupLocalFile() call
hajoha Jan 7, 2025
13d9760
update MQTTService
hajoha Jan 7, 2025
69c8094
add support for Influx-Error in Notification
hajoha Jan 7, 2025
6924957
remove sending intent
hajoha Jan 8, 2025
727eb06
UX cleanup for Android API level35 changes. Bumb target sdk to 35
PeterHasse Jan 8, 2025
0bb32bf
add show status of influx connection, if influx (un)-reachable and if…
hajoha Jan 8, 2025
a3e604f
fix message if no logging target is enabled
hajoha Jan 8, 2025
d05313c
move Cell Notification away from LoggingService
hajoha Jan 8, 2025
808cec7
add LTE/NR support for Cell Notification and call NotificationService…
hajoha Jan 8, 2025
b4173a7
move Notifcation Create to end
hajoha Jan 8, 2025
eac1823
move ping func back to original state
hajoha Jan 8, 2025
b61c75f
remove old Notification code
hajoha Jan 8, 2025
61bc069
remove unused imports
hajoha Jan 8, 2025
c43b637
Merge remote-tracking branch 'origin/rel/0.5' into fix/logging_notifi…
hajoha Jan 8, 2025
178e883
UX cleanup for Android API level35 changes. Bumb target sdk to 35
PeterHasse Jan 8, 2025
16aa781
Merge branch 'rel/0.5' of github.com:omnt/OpenMobileNetworkToolkit in…
PeterHasse Jan 8, 2025
4ee8bdc
fix notification display bug in combination of disabling LoggingServi…
hajoha Jan 8, 2025
32bc998
Merge remote-tracking branch 'origin/rel/0.5' into fix/logging_notifi…
hajoha Jan 8, 2025
276ebca
fix Cell Notification Display bug
hajoha Jan 8, 2025
e68be6a
Merge pull request #45 from omnt/fix/logging_notification
PeterHasse Jan 8, 2025
3bcc69c
UX improvements. Disbaled currently not used menu items
PeterHasse Jan 10, 2025
97dd0a1
add Service Type
hajoha Jan 12, 2025
e843e52
receive last will exactly once
hajoha Jan 13, 2025
13f2b47
fix bug, remove Cell Notification when disabled
hajoha Jan 13, 2025
d3196dc
Merge pull request #47 from omnt/fix/logging_notification
PeterHasse Jan 13, 2025
b7930ee
UX tweaks for samsung Android 13/14. Why is samsung always that bad?
PeterHasse Jan 13, 2025
2bb8abf
Show Servicename and app-name in notifications
hajoha Jan 13, 2025
893fdd6
Merge remote-tracking branch 'origin/rel/0.5' into rel/0.5
hajoha Jan 13, 2025
64fe7b3
add setContentText when notification is updated
hajoha Jan 13, 2025
7801e90
futuer UX tweaks
PeterHasse Jan 13, 2025
ce380e3
do not show time of Notification
hajoha Jan 13, 2025
ad707b1
Merge branch 'rel/0.5' into feature/mqtt-support
hajoha Jan 28, 2025
c1f340c
fix typo
hajoha Jan 28, 2025
1026b14
move device name setting to main Setting preference and force user to…
hajoha Jan 28, 2025
cee64ce
remove UUID generation
hajoha Jan 28, 2025
fb55495
update LoggingFragment
hajoha Jan 28, 2025
6722fd5
update
hajoha Feb 5, 2025
b15c299
update
hajoha Feb 7, 2025
25e12be
update
hajoha Feb 7, 2025
de333d6
update
hajoha Feb 9, 2025
aee5182
working
hajoha Feb 9, 2025
5b86e5c
fix monitoring of status
hajoha Feb 9, 2025
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
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
# OpenMobileNetworkToolkit Changelog
## Release [0.5] - 38c3

### Added
- Option to set EPDG static address
- build information are now also written to the logging framework
- git hash is no shown and logged

### Changed
- tm instance is now updated in favor of creating a new one if subscription does not match

### Fixed
- crash of the quick view on some phones

## Release [0.4] - Stralsund

### Added
Expand All @@ -17,7 +30,6 @@
- Fix crash where no UICC or Cell is available
- Wrong value in Wifi RSSI filed

# OpenMobileNetworkToolkit Changelog
## Release [0.3.1]

### Added
Expand Down
31 changes: 23 additions & 8 deletions OpenMNT_logo_no_title.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
173 changes: 173 additions & 0 deletions OpenMNT_logo_titel_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 29 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ def getGitHash = { ->
}

android {
packagingOptions {
resources {
excludes += ['META-INF/INDEX.LIST', 'META-INF/io.netty.versions.properties']
}
}
signingConfigs {
debug {
keyAlias keystoreProperties['keyAlias']
Expand All @@ -49,14 +54,14 @@ android {
}
}

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "de.fraunhofer.fokus.OpenMobileNetworkToolkit"
minSdk 31
targetSdk 34
versionCode 4
versionName "0.4"
targetSdk 35
versionCode 5
versionName "0.5"
resValue("string", "git_hash", getGitHash())

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -109,7 +114,7 @@ spdxSbom {
configurations = ['releaseRuntimeClasspath']
scm {
uri.set("https://github.com/omnt/OpenMobileNetworkToolkit")
revision.set("0.3")
revision.set("0.5")
}
document {
name.set("OpenMobileNetworkToolkit")
Expand All @@ -122,22 +127,31 @@ spdxSbom {
}

dependencies {
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.work:work-runtime:2.9.1'
def work_version = "2.10.0"
def room_version = "2.6.1"


implementation "androidx.work:work-runtime:$work_version"
implementation "androidx.work:work-runtime-ktx:$work_version"
implementation "androidx.work:work-rxjava2:$work_version"
implementation "androidx.work:work-gcm:$work_version"
androidTestImplementation "androidx.work:work-testing:$work_version"
implementation "androidx.work:work-multiprocess:$work_version"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.6.0"
implementation 'androidx.preference:preference:1.2.1'
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.guava:guava:33.2.1-jre'
implementation 'com.google.guava:guava:33.4.0-jre'
implementation 'androidx.concurrent:concurrent-futures:1.2.0'
implementation 'androidx.activity:activity:1.9.3'
implementation 'androidx.fragment:fragment:1.8.4'
implementation 'androidx.fragment:fragment:1.8.5'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment:2.8.3'
implementation 'androidx.navigation:navigation-ui:2.8.3'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.navigation:navigation-fragment:2.8.5'
implementation 'androidx.navigation:navigation-ui:2.8.5'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
Expand All @@ -150,6 +164,9 @@ dependencies {
implementation 'com.github.anastr:speedviewlib:1.6.1'
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.compose.material3:material3:1.3.0"
implementation("com.hivemq:hivemq-mqtt-client:1.3.4")
implementation "androidx.compose.material3:material3:1.3.1"

}

configurations.implementation {
Expand Down
7 changes: 6 additions & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@
-assumenosideeffects class android.util.Log {
public static *** d(...);
public static *** v(...);
}
}

-keepclassmembernames class io.netty.** { *; }
-keepclassmembers class org.jctools.** { *; }


Loading
Loading