Switch from Otto to EventBus

app/build.gradle

@@ -90,7 +90,7 @@ dependencies {
     compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
-    compile 'com.squareup:otto:1.3.8'
+    compile 'org.greenrobot:eventbus:3.0.0'
     compile 'io.reactivex:rxjava:1.1.9'
     compile 'com.artemzin.rxjava:proguard-rules:1.1.9.0'
     compile 'io.reactivex:rxandroid:1.2.1'

app/proguard-rules.pro

@@ -48,27 +48,6 @@
 # If your rest service methods throw custom exceptions, because you've defined an ErrorHandler.
 -keepattributes Signature
-# Also you must note that if you are using GSON for conversion from JSON to POJO representation, you must ignore those POJO classes from being obfuscated.
-# Here include the POJO's that have you have created for mapping JSON response to POJO for example.
-
-## GSON 2.2.4 specific rules ##
-
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
--keepattributes EnclosingMethod
-
-# Gson specific classes
--keep class sun.misc.Unsafe { *; }
--keep class com.google.gson.stream.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
--keep class com.commit451.gitlab.model.** { *; }
-
 # Simple-Xml Proguard Config
 # Keep public classes and methods.
@@ -88,26 +67,16 @@
 -keep interface com.squareup.okhttp.** { *; }
 -dontwarn com.squareup.okhttp.**
-## Square Otto specific rules ##
-## https://square.github.io/otto/ ##
-
+# EventBus
+-keepattributes *Annotation*
 -keepclassmembers class ** {
-    @com.squareup.otto.Subscribe public *;
-    @com.squareup.otto.Produce public *;
-}
-
-# ButterKnife 7
-
--keep class butterknife.** { *; }
--dontwarn butterknife.internal.**
--keep class **$$ViewBinder { *; }
-
--keepclasseswithmembernames class * {
-    @butterknife.* <fields>;
+    @org.greenrobot.eventbus.Subscribe <methods>;
 }
--keepclasseswithmembernames class * {
-    @butterknife.* <methods>;
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+# Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
 }
 ## joda-time-android 2.8.0

app/src/main/java/com/commit451/gitlab/App.java

@@ -18,11 +18,12 @@ import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.util.FabricUtil;
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs;
 import com.squareup.leakcanary.LeakCanary;
-import com.squareup.otto.Bus;
 import com.squareup.picasso.Picasso;
 import net.danlew.android.joda.JodaTimeAndroid;
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
 import java.util.Locale;
@@ -43,12 +44,12 @@ public class App extends Application {
         LoganSquare.registerTypeConverter(Uri.class, new UriTypeConverter());
     }
-    private static Bus sBus;
+    private static EventBus sBus;
     private static App sInstance;
-    public static Bus bus() {
+    public static EventBus bus() {
         if (sBus == null) {
-            sBus = new Bus();
+            sBus = EventBus.getDefault();
         }
         return sBus;
     }

app/src/main/java/com/commit451/gitlab/activity/ActivityActivity.java

@@ -13,7 +13,8 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.event.CloseDrawerEvent;
 import com.commit451.gitlab.fragment.FeedFragment;
-import com.squareup.otto.Subscribe;
+
+import org.greenrobot.eventbus.Subscribe;
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java

@@ -23,7 +23,8 @@ import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.DynamicGridLayoutManager;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.commit451.gitlab.viewHolder.GroupViewHolder;
-import com.squareup.otto.Subscribe;
+
+import org.greenrobot.eventbus.Subscribe;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java

@@ -33,8 +33,8 @@ import com.commit451.gitlab.util.IntentUtil;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.commit451.gitlab.view.SendMessageView;
 import com.commit451.teleprinter.Teleprinter;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;
 import java.io.ByteArrayOutputStream;

app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java

@@ -26,8 +26,8 @@ import com.commit451.gitlab.model.api.Milestone;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/activity/ProjectsActivity.java

@@ -17,7 +17,8 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.ProjectsPagerAdapter;
 import com.commit451.gitlab.event.CloseDrawerEvent;
 import com.commit451.gitlab.navigation.Navigator;
-import com.squareup.otto.Subscribe;
+
+import org.greenrobot.eventbus.Subscribe;
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/activity/TodosActivity.java

@@ -15,7 +15,8 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.TodoPagerAdapter;
 import com.commit451.gitlab.event.CloseDrawerEvent;
-import com.squareup.otto.Subscribe;
+
+import org.greenrobot.eventbus.Subscribe;
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/fragment/BaseFragment.java

@@ -7,7 +7,9 @@ import android.view.View;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.event.ReloadDataEvent;
-import com.squareup.otto.Subscribe;
+
+import org.greenrobot.eventbus.Subscribe;
+
 public class BaseFragment extends Fragment{

app/src/main/java/com/commit451/gitlab/fragment/BuildArtifactsFragment.java

@@ -11,18 +11,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.BuildArtifactsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Artifact;
 import com.commit451.gitlab.model.api.Build;
 import com.commit451.gitlab.model.api.Project;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.java

@@ -19,7 +19,7 @@ import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.model.api.Runner;
 import com.commit451.gitlab.util.DateUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/fragment/BuildsFragment.java

@@ -28,7 +28,7 @@ import com.commit451.gitlab.model.api.Build;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/fragment/CommitsFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.navigation.Navigator;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/fragment/FilesFragment.java

@@ -27,7 +27,7 @@ import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.IntentUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/fragment/GroupMembersFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.model.api.Member;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.DynamicGridLayoutManager;
 import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/fragment/IssuesFragment.java

@@ -30,7 +30,7 @@ import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestCommitsFragment.java

@@ -22,7 +22,7 @@ import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.navigation.Navigator;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.java

@@ -24,7 +24,7 @@ import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.commit451.gitlab.view.SendMessageView;
 import com.commit451.teleprinter.Teleprinter;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestsFragment.java

@@ -26,7 +26,7 @@ import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
-import com.squareup.otto.Subscribe;
+import org.greenrobot.eventbus.Subscribe;
 import java.util.List;