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.

Sign up for GitHub

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

Replaced Otto event bus library with RxJava event bus #941

Open
wants to merge 1 commit into
base: gsoc2022
Choose a base branch
from
Open

Replaced Otto event bus library with RxJava event bus #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion org.envirocar.app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/BaseApplicationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/aidl/EnviroCarDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/handler/LocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/injection/BaseInjectorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/recording/RecordingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/recording/notification/RecordingNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/services/autoconnect/AutoRecordingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/services/autoconnect/OBDAutoRecordingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions org.envirocar.app/src/org/envirocar/app/services/trackchunks/TrackchunkUploadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/views/BaseMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion org.envirocar.app/src/org/envirocar/app/views/obdselection/OBDSelectionActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading