From 9743011f253bf13f003f958fac119444ff18f4e4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 14 Nov 2018 17:56:07 +0100 Subject: [PATCH] remove now unused greenrobot.eventbus --- build.gradle | 2 -- src/org/thoughtcrime/securesms/ConversationActivity.java | 4 ---- .../thoughtcrime/securesms/ConversationListFragment.java | 3 --- .../securesms/database/IdentityDatabase.java | 5 ----- .../SqlCipherMigrationRequirementProvider.java | 9 --------- .../securesms/util/TextSecurePreferences.java | 2 -- 6 files changed, 25 deletions(-) diff --git a/build.gradle b/build.gradle index 5c64fca0e..28b70cc75 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,6 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' compile 'com.makeramen:roundedimageview:2.1.0' compile 'com.pnikosis:materialish-progress:1.5' - compile 'org.greenrobot:eventbus:3.0.0' compile 'pl.tajchert:waitingdots:0.1.0' compile 'com.soundcloud.android:android-crop:0.9.10@aar' compile 'com.melnykov:floatingactionbutton:1.3.0' @@ -184,7 +183,6 @@ dependencyVerification { 'com.github.chrisbanes:PhotoView:ed06775308da260e1fd86d1d3288988fcd3d80db24ce0d7c9fcfedc39e622292', 'com.github.bumptech.glide:glide:997de7ac95be6c944d3b8cbe13de11307736ea45451c1b09a6cec7c328ead59f', 'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1', - 'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c', 'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177', 'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883', 'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb', diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 227c0f79f..197b1b233 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -67,7 +67,6 @@ import com.b44t.messenger.DcEventCenter; import com.b44t.messenger.DcMsg; import com.google.android.gms.location.places.ui.PlacePicker; -import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.audio.AudioRecorder; import org.thoughtcrime.securesms.audio.AudioSlidePlayer; @@ -312,7 +311,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity @Override protected void onStart() { super.onStart(); - EventBus.getDefault().register(this); } @Override @@ -345,13 +343,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity fragment.setLastSeen(System.currentTimeMillis()); markLastSeen(); AudioSlidePlayer.stopAll(); - EventBus.getDefault().unregister(this); } @Override protected void onStop() { super.onStop(); - EventBus.getDefault().unregister(this); } @Override diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 4e9b9a76a..a8821c7ab 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -56,7 +56,6 @@ import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEventCenter; -import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener; import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator; import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton; @@ -157,7 +156,6 @@ public class ConversationListFragment extends Fragment updateReminders(true); list.getAdapter().notifyDataSetChanged(); - EventBus.getDefault().register(this); } @Override @@ -165,7 +163,6 @@ public class ConversationListFragment extends Fragment super.onPause(); fab.stopPulse(); - EventBus.getDefault().unregister(this); } public ConversationListAdapter getListAdapter() { diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java index 8f26a84b0..c4121a63c 100644 --- a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java +++ b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java @@ -24,7 +24,6 @@ import android.support.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; -import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.util.Base64; import org.whispersystems.libsignal.IdentityKey; @@ -123,9 +122,6 @@ public class IdentityDatabase extends Database { contentValues.put(FIRST_USE, firstUse ? 1 : 0); database.replace(TABLE_NAME, null, contentValues); - - EventBus.getDefault().post(new IdentityRecord(address, identityKey, verifiedStatus, - firstUse, timestamp, nonBlockingApproval)); } public void setApproval(Address address, boolean nonBlockingApproval) { @@ -148,7 +144,6 @@ public class IdentityDatabase extends Database { if (updated > 0) { Optional record = getIdentity(address); - if (record.isPresent()) EventBus.getDefault().post(record.get()); } } diff --git a/src/org/thoughtcrime/securesms/jobs/requirements/SqlCipherMigrationRequirementProvider.java b/src/org/thoughtcrime/securesms/jobs/requirements/SqlCipherMigrationRequirementProvider.java index 2ce574f51..96eb91b22 100644 --- a/src/org/thoughtcrime/securesms/jobs/requirements/SqlCipherMigrationRequirementProvider.java +++ b/src/org/thoughtcrime/securesms/jobs/requirements/SqlCipherMigrationRequirementProvider.java @@ -1,9 +1,6 @@ package org.thoughtcrime.securesms.jobs.requirements; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; import org.thoughtcrime.securesms.jobmanager.requirements.RequirementListener; import org.thoughtcrime.securesms.jobmanager.requirements.RequirementProvider; @@ -12,7 +9,6 @@ public class SqlCipherMigrationRequirementProvider implements RequirementProvide private RequirementListener listener; public SqlCipherMigrationRequirementProvider() { - EventBus.getDefault().register(this); } @Override @@ -20,11 +16,6 @@ public class SqlCipherMigrationRequirementProvider implements RequirementProvide this.listener = listener; } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onEvent(SqlCipherNeedsMigrationEvent event) { - if (listener != null) listener.onRequirementStatusChanged(); - } - public static class SqlCipherNeedsMigrationEvent { } diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java index 1c6d5d117..237d572b9 100644 --- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -15,7 +15,6 @@ import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.util.Log; -import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.jobs.requirements.SqlCipherMigrationRequirementProvider; import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; import org.whispersystems.libsignal.util.Medium; @@ -182,7 +181,6 @@ public class TextSecurePreferences { public static void setNeedsSqlCipherMigration(@NonNull Context context, boolean value) { setBooleanPreference(context, NEEDS_SQLCIPHER_MIGRATION, value); - EventBus.getDefault().post(new SqlCipherMigrationRequirementProvider.SqlCipherNeedsMigrationEvent()); } public static boolean getNeedsSqlCipherMigration(@NonNull Context context) {