From 1c8fe2b2d9cfaf9411b241406fe0543e8d608c08 Mon Sep 17 00:00:00 2001 From: Akash-Ramjyothi Date: Fri, 22 Jul 2022 12:17:51 +0530 Subject: [PATCH] Replaced Otto event bus with RxJava event bus --- build.gradle | 2 +- org.envirocar.app/build.gradle | 3 ++- .../envirocar/app/BaseApplicationModule.java | 5 +++-- .../app/aidl/EnviroCarDataService.java | 2 +- .../envirocar/app/handler/BluetoothHandler.java | 4 ++-- .../InterpolationMeasurementProvider.java | 2 +- .../envirocar/app/handler/LocationHandler.java | 4 ++-- .../app/handler/TrackRecordingHandler.java | 2 +- .../preferences/CarPreferenceHandler.java | 6 +++--- .../preferences/UserPreferenceHandler.java | 2 +- .../userstatistics/UserStatisticsProcessor.java | 6 +++--- .../app/injection/BaseInjectorActivity.java | 2 +- .../app/injection/BaseInjectorFragment.java | 2 +- .../app/injection/BaseInjectorService.java | 2 +- .../AutomaticUploadNotificationHandler.java | 4 ++-- .../app/recording/RecordingModule.java | 2 +- .../app/recording/RecordingService.java | 2 +- .../notification/RecordingNotification.java | 4 ++-- .../recording/notification/SpeechOutput.java | 4 ++-- .../recording/provider/LocationProvider.java | 2 +- .../provider/RecordingDetailsProvider.java | 6 +++--- .../recording/provider/TrackDatabaseSink.java | 2 +- .../strategy/GPSRecordingStrategy.java | 4 ++-- .../strategy/OBDRecordingStrategy.java | 4 ++-- .../autoconnect/AutoRecordingModule.java | 2 +- .../autoconnect/AutoRecordingNotification.java | 2 +- .../autoconnect/AutoRecordingService.java | 2 +- .../autoconnect/OBDAutoRecordingStrategy.java | 4 ++-- .../trackchunks/TrackchunkUploadService.java | 5 +++-- .../envirocar/app/views/BaseMainActivity.java | 2 +- .../app/views/dashboard/DashboardFragment.java | 2 +- .../obdselection/OBDSelectionActivity.java | 2 +- .../obdselection/OBDSelectionFragment.java | 17 ++++++++++++++--- .../preferences/BluetoothPairingPreference.java | 4 ++-- .../RecordingScreenActivity.java | 2 +- .../app/views/recordingscreen/Tempomat.java | 4 ++-- .../views/recordingscreen/TempomatFragment.java | 2 +- .../views/recordingscreen/TrackMapFragment.java | 2 +- .../tracklist/TrackListLocalCardFragment.java | 2 +- .../tracklist/TrackListRemoteCardFragment.java | 2 +- org.envirocar.core/build.gradle | 2 +- org.envirocar.obd/build.gradle | 2 +- .../java/org/envirocar/obd/OBDController.java | 2 +- 43 files changed, 77 insertions(+), 63 deletions(-) diff --git a/build.gradle b/build.gradle index bd57358c8..3e7ff9469 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ ext { daggerCompiler = 'com.google.dagger:dagger-compiler:2.35.1' butterKnife = 'com.jakewharton:butterknife:10.2.3' butterknifeCompiler = 'com.jakewharton:butterknife-compiler:10.2.3' - otto = 'com.squareup:otto:1.3.8' + rxBus = 'com.hwangjr.rxbus:rxbus:3.0.0' // Retrofit2 dependencies. def retrofit_version = "2.6.1" diff --git a/org.envirocar.app/build.gradle b/org.envirocar.app/build.gradle index 08939fc61..33f97bb79 100644 --- a/org.envirocar.app/build.gradle +++ b/org.envirocar.app/build.gradle @@ -20,8 +20,9 @@ dependencies { // Dependency injection, view injection, event bus ... implementation rootProject.ext.dagger - implementation rootProject.ext.otto + implementation rootProject.ext.rxBus implementation rootProject.ext.butterKnife + implementation 'com.hwangjr.rxbus:rxbus:3.0.0' annotationProcessor rootProject.ext.daggerCompiler annotationProcessor rootProject.ext.butterknifeCompiler diff --git a/org.envirocar.app/src/org/envirocar/app/BaseApplicationModule.java b/org.envirocar.app/src/org/envirocar/app/BaseApplicationModule.java index 01833200b..4f77154df 100644 --- a/org.envirocar.app/src/org/envirocar/app/BaseApplicationModule.java +++ b/org.envirocar.app/src/org/envirocar/app/BaseApplicationModule.java @@ -25,8 +25,9 @@ import android.preference.PreferenceManager; import com.f2prateek.rx.preferences2.RxSharedPreferences; -import com.squareup.otto.Bus; -import com.squareup.otto.ThreadEnforcer; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.thread.ThreadEnforcer; +import com.hwangjr.rxbus.thread.ThreadEnforcer; import org.envirocar.app.handler.HandlerModule; import org.envirocar.app.handler.TemporaryFileManager; diff --git a/org.envirocar.app/src/org/envirocar/app/aidl/EnviroCarDataService.java b/org.envirocar.app/src/org/envirocar/app/aidl/EnviroCarDataService.java index b5d99fef4..b756783f6 100644 --- a/org.envirocar.app/src/org/envirocar/app/aidl/EnviroCarDataService.java +++ b/org.envirocar.app/src/org/envirocar/app/aidl/EnviroCarDataService.java @@ -25,7 +25,7 @@ import androidx.annotation.Nullable; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.aidl.ECMeasurement; import org.envirocar.aidl.ECRawObdValue; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java index 2e106bbdc..debb28463 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java @@ -30,8 +30,8 @@ import android.util.Pair; import com.google.common.base.Preconditions; -import com.squareup.otto.Bus; -import com.squareup.otto.Produce; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Produce; import org.envirocar.app.recording.RecordingService; import org.envirocar.app.rxutils.RxBroadcastReceiver; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java b/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java index 3259d2c13..e2e7ff7ec 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java @@ -20,7 +20,7 @@ import android.location.Location; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.algorithm.AbstractMeasurementProvider; import org.envirocar.app.handler.algorithm.DataResponseAlgorithm; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/LocationHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/LocationHandler.java index 41368bb52..7e37cd5af 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/LocationHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/LocationHandler.java @@ -29,8 +29,8 @@ import androidx.core.app.ActivityCompat; -import com.squareup.otto.Bus; -import com.squareup.otto.Produce; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Produce; import org.envirocar.core.events.gps.GpsStateChangedEvent; import org.envirocar.core.injection.InjectApplicationScope; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java index 89299c93b..50bf86be3 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.icu.text.AlphabeticIndex; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.BaseApplication; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java index 6fb6b10fe..21cc7df8a 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java @@ -28,9 +28,9 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Produce; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Produce; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.R; import org.envirocar.app.handler.DAOProvider; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java b/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java index 598a45695..8dfad15e0 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java @@ -22,7 +22,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.exception.LoginException; import org.envirocar.app.handler.DAOProvider; diff --git a/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java b/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java index 417e288a4..b8dfed9c9 100644 --- a/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java +++ b/org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java @@ -24,9 +24,9 @@ import androidx.annotation.NonNull; import com.google.common.base.MoreObjects; -import com.squareup.otto.Bus; -import com.squareup.otto.Produce; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Produce; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.handler.DAOProvider; import org.envirocar.app.handler.TrackDAOHandler; diff --git a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorActivity.java b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorActivity.java index 4f1a69a97..f9e666636 100644 --- a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorActivity.java @@ -23,7 +23,7 @@ import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.BaseApplication; import org.envirocar.app.BaseApplicationComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorFragment.java b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorFragment.java index 7794be80d..08a86ce29 100644 --- a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorFragment.java @@ -24,7 +24,7 @@ import android.util.Log; import com.google.common.base.Preconditions; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.BaseApplication; import org.envirocar.app.BaseApplicationComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorService.java b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorService.java index 399bff098..e97362edf 100644 --- a/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorService.java +++ b/org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorService.java @@ -25,7 +25,7 @@ import androidx.annotation.Nullable; import androidx.lifecycle.LifecycleService; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.BaseApplication; import org.envirocar.app.BaseApplicationComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java b/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java index 2fc4972b0..225efcfd5 100644 --- a/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java +++ b/org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java @@ -27,8 +27,8 @@ import androidx.core.app.NotificationCompat; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.R; import org.envirocar.app.handler.ApplicationSettings; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/RecordingModule.java b/org.envirocar.app/src/org/envirocar/app/recording/RecordingModule.java index 93b30dba2..88f5ad55e 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/RecordingModule.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/RecordingModule.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.PowerManager; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.algorithm.MeasurementProvider; import org.envirocar.app.handler.*; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java b/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java index ce31474af..5e9887802 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java @@ -26,7 +26,7 @@ import androidx.annotation.Nullable; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.BaseApplication; import org.envirocar.app.injection.ScopedBaseInjectorService; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/notification/RecordingNotification.java b/org.envirocar.app/src/org/envirocar/app/recording/notification/RecordingNotification.java index 18a39c99d..3cad2fd9f 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/notification/RecordingNotification.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/notification/RecordingNotification.java @@ -35,8 +35,8 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.R; import org.envirocar.app.events.AvrgSpeedUpdateEvent; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java b/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java index f5133983d..84427aa46 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java @@ -25,8 +25,8 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.handler.ApplicationSettings; import org.envirocar.core.events.gps.GpsSatelliteFix; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java index e417aaee2..0c59dd658 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java @@ -28,7 +28,7 @@ import android.os.Build; import android.os.Bundle; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.recording.RecordingScope; import org.envirocar.core.events.gps.GpsDOPEvent; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java index 8c45433a3..db7dab95c 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java @@ -25,9 +25,9 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Produce; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Produce; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.events.AvrgSpeedUpdateEvent; import org.envirocar.app.events.DistanceValueUpdateEvent; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java b/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java index ce7ec5269..4091dc5b0 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java @@ -20,7 +20,7 @@ import android.content.Context; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.R; import org.envirocar.app.handler.preferences.CarPreferenceHandler; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java index 496a3752f..e64fcae5c 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java @@ -35,8 +35,8 @@ import com.google.android.gms.location.ActivityTransitionResult; import com.google.android.gms.location.DetectedActivity; import com.google.android.gms.tasks.Task; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.algorithm.MeasurementProvider; import org.envirocar.app.BuildConfig; diff --git a/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java index 170fa9a20..0dedbfbef 100644 --- a/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java +++ b/org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java @@ -24,8 +24,8 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.algorithm.MeasurementProvider; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingModule.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingModule.java index a9098eebe..110d2aa18 100644 --- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingModule.java +++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingModule.java @@ -22,7 +22,7 @@ import android.content.Context; import android.os.PowerManager; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.handler.BluetoothHandler; import org.envirocar.app.handler.LocationHandler; diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingNotification.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingNotification.java index 2f0725a44..399cf61d1 100644 --- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingNotification.java +++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingNotification.java @@ -33,7 +33,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.app.handler.BluetoothHandler; import org.envirocar.app.notifications.EnviroCarNotification; diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java index 6b1d0e9e9..6e113987e 100644 --- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java +++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java @@ -24,7 +24,7 @@ import android.os.IBinder; import android.os.PowerManager; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplication; import org.envirocar.app.handler.ApplicationSettings; diff --git a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java index fdc238562..acdd20218 100644 --- a/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java +++ b/org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java @@ -24,8 +24,8 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.OnLifecycleEvent; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.handler.ApplicationSettings; import org.envirocar.app.handler.BluetoothHandler; diff --git a/org.envirocar.app/src/org/envirocar/app/services/trackchunks/TrackchunkUploadService.java b/org.envirocar.app/src/org/envirocar/app/services/trackchunks/TrackchunkUploadService.java index 5d0d608e7..49e615228 100644 --- a/org.envirocar.app/src/org/envirocar/app/services/trackchunks/TrackchunkUploadService.java +++ b/org.envirocar.app/src/org/envirocar/app/services/trackchunks/TrackchunkUploadService.java @@ -9,8 +9,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.Scheduler; diff --git a/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java b/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java index c4fedcd89..21ef2a2e1 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java @@ -36,7 +36,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.snackbar.Snackbar; import com.mapbox.mapboxsdk.Mapbox; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java index 79ef72806..9fc833a51 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java @@ -70,7 +70,7 @@ import com.google.android.play.core.install.model.UpdateAvailability; import com.google.android.play.core.tasks.Task; import com.jakewharton.rxbinding3.appcompat.RxToolbar; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionActivity.java b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionActivity.java index a8e693248..4bcfe659f 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionActivity.java @@ -26,7 +26,7 @@ import android.widget.Switch; import android.widget.TextView; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java index 6f5ed2f17..d0ce5bc4c 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionFragment.java @@ -19,6 +19,7 @@ package org.envirocar.app.views.obdselection; import android.Manifest; +import android.annotation.SuppressLint; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.CountDownTimer; @@ -36,7 +37,7 @@ import androidx.annotation.Nullable; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; @@ -237,11 +238,11 @@ public void onPermissionsGranted(int requestCode, @NonNull @NotNull List // if location permissions are granted, start Bluetooth discovery. if (requestCode == BLUETOOTH_PERMISSIONS) { startBluetoothDiscovery(); - + // Check the GPS and Location permissions // before Starting the discovery of bluetooth devices. updateContentView(); - + showSnackbar(getString(R.string.location_permission_granted)); } } @@ -328,6 +329,7 @@ public void onError(Throwable e) { LOGGER.error("Error while discovering bluetooth devices", e); } + @SuppressLint("MissingPermission") @Override public void onNext(BluetoothDevice device) { LOGGER.info(String.format( @@ -345,6 +347,7 @@ public void onNext(BluetoothDevice device) { }); } + @SuppressLint("MissingPermission") private void setupListViews() { BluetoothDevice selectedBTDevice = mBluetoothHandler.getSelectedBluetoothDevice(); @@ -352,6 +355,7 @@ private void setupListViews() { mNewDevicesArrayAdapter = new OBDDeviceListAdapter(getActivity(), false); mPairedDevicesAdapter = new OBDDeviceListAdapter(getActivity(), true, new OBDDeviceListAdapter.OnOBDListActionCallback() { + @SuppressLint("MissingPermission") @Override public void onOBDDeviceSelected(BluetoothDevice device) { LOGGER.info(String.format("onOBDDeviceSelected(%s)", device.getName())); @@ -364,6 +368,7 @@ public void onOBDDeviceSelected(BluetoothDevice device) { R.string.obd_selection_is_selected_template), device.getName())); } + @SuppressLint("MissingPermission") @Override public void onDeleteOBDDevice(BluetoothDevice device) { LOGGER.info(String.format("onDeleteOBDDevice(%s)", device.getName())); @@ -396,6 +401,7 @@ public void onDeleteOBDDevice(BluetoothDevice device) { }); } + @SuppressLint("MissingPermission") private void showUnpairingDialog(BluetoothDevice device) { // Create the AlertDialog. new MaterialAlertDialogBuilder(getActivity(), R.style.MaterialDialog) @@ -415,6 +421,7 @@ private void unpairDevice(BluetoothDevice device) { // Try to unpair the device mBluetoothHandler.unpairDevice(device, new BluetoothHandler.BluetoothDeviceUnpairingCallback() { + @SuppressLint("MissingPermission") @Override public void onDeviceUnpaired(BluetoothDevice device) { showSnackbar(String.format( @@ -428,6 +435,7 @@ public void onDeviceUnpaired(BluetoothDevice device) { updatePairedDevicesList(); } + @SuppressLint("MissingPermission") @Override public void onUnpairingError(BluetoothDevice device) { showSnackbar(String.format( @@ -471,6 +479,7 @@ private void pairDevice(BluetoothDevice device, final View view) { mBluetoothHandler.pairDevice(device, new BluetoothHandler.BluetoothDevicePairingCallback() { + @SuppressLint("MissingPermission") @Override public void onPairingStarted(BluetoothDevice device) { pairingIsRunning = true; @@ -480,6 +489,7 @@ public void onPairingStarted(BluetoothDevice device) { } } + @SuppressLint("MissingPermission") @Override public void onPairingError(BluetoothDevice device) { pairingIsRunning = false; @@ -492,6 +502,7 @@ public void onPairingError(BluetoothDevice device) { text.setText(device.getName()); } + @SuppressLint("MissingPermission") @Override public void onDevicePaired(BluetoothDevice device) { pairingIsRunning = false; diff --git a/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java b/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java index ad5dc59e6..f635acd84 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java +++ b/org.envirocar.app/src/org/envirocar/app/views/preferences/BluetoothPairingPreference.java @@ -36,8 +36,8 @@ import androidx.appcompat.widget.Toolbar; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.R; import org.envirocar.app.handler.BluetoothHandler; diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java index 1de032ba0..ccd2cf207 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/RecordingScreenActivity.java @@ -33,7 +33,7 @@ import androidx.fragment.app.FragmentTransaction; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/Tempomat.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/Tempomat.java index d6e825e77..062177147 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/Tempomat.java +++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/Tempomat.java @@ -41,8 +41,8 @@ import android.widget.FrameLayout; import com.google.common.base.Preconditions; -import com.squareup.otto.Bus; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.Bus; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplication; import org.envirocar.app.R; diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TempomatFragment.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TempomatFragment.java index 1e44f8cdc..78e9c4331 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TempomatFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TempomatFragment.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.injection.components.MainActivityComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java index 3a1a5bd99..1c468cfd5 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/recordingscreen/TrackMapFragment.java @@ -33,6 +33,7 @@ import android.view.animation.AnimationUtils; import android.widget.Toast; +import com.hwangjr.rxbus.annotation.Subscribe; import com.mapbox.android.core.location.LocationEngineRequest; import com.mapbox.android.core.permissions.PermissionsListener; import com.mapbox.android.core.permissions.PermissionsManager; @@ -53,7 +54,6 @@ import com.mapbox.mapboxsdk.style.layers.LineLayer; import com.mapbox.mapboxsdk.style.layers.PropertyFactory; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; -import com.squareup.otto.Subscribe; import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.injection.components.MainActivityComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java index d4508e537..e9b3b5c0b 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java @@ -30,7 +30,7 @@ import com.afollestad.materialdialogs.MaterialDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplication; import org.envirocar.app.BaseApplicationComponent; diff --git a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java index edfc3fa27..ab2bef675 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java +++ b/org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListRemoteCardFragment.java @@ -25,7 +25,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.squareup.otto.Subscribe; +import com.hwangjr.rxbus.annotation.Subscribe; import org.envirocar.app.BaseApplication; import org.envirocar.app.BaseApplicationComponent; diff --git a/org.envirocar.core/build.gradle b/org.envirocar.core/build.gradle index 9805a3f19..73e4544e8 100644 --- a/org.envirocar.core/build.gradle +++ b/org.envirocar.core/build.gradle @@ -23,7 +23,7 @@ dependencies { // Dependency injection, view injection, event bus... implementation rootProject.ext.dagger annotationProcessor rootProject.ext.daggerCompiler - implementation rootProject.ext.otto + implementation rootProject.ext.rxBus // RxJava dependencies implementation rootProject.ext.rxAndroid diff --git a/org.envirocar.obd/build.gradle b/org.envirocar.obd/build.gradle index 99b3093fb..6ce482957 100644 --- a/org.envirocar.obd/build.gradle +++ b/org.envirocar.obd/build.gradle @@ -29,7 +29,7 @@ dependencies { // Dependency injection, view injection, event bus... implementation rootProject.ext.dagger annotationProcessor rootProject.ext.daggerCompiler - implementation rootProject.ext.otto + implementation rootProject.ext.rxBus // RxJava dependencies implementation rootProject.ext.rxAndroid diff --git a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java index 40485eaaf..67691f2a3 100644 --- a/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java +++ b/org.envirocar.obd/src/main/java/org/envirocar/obd/OBDController.java @@ -19,7 +19,7 @@ package org.envirocar.obd; import com.google.common.base.Preconditions; -import com.squareup.otto.Bus; +import com.hwangjr.rxbus.Bus; import org.envirocar.core.entity.Measurement; import org.envirocar.core.logging.Logger;