fix: Implementation of LiveData for SpeakerDetailsActivity (#2381)

fossasia · Mar 18, 2018 · 9bb3f4c · 9bb3f4c
1 parent d41e69a
commit 9bb3f4c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/android/app/src/main/java/org/fossasia/openevent/core/speaker/SpeakerDetailsActivity.java b/android/app/src/main/java/org/fossasia/openevent/core/speaker/SpeakerDetailsActivity.java
@@ -34,7 +34,6 @@
 
 import org.fossasia.openevent.R;
 import org.fossasia.openevent.common.api.Urls;
-import org.fossasia.openevent.common.events.BookmarkChangedEvent;
 import org.fossasia.openevent.common.events.ConnectionCheckEvent;
 import org.fossasia.openevent.common.ui.SnackbarUtil;
 import org.fossasia.openevent.common.ui.Views;
@@ -55,7 +54,6 @@
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import timber.log.Timber;
 
 public class SpeakerDetailsActivity extends BaseActivity implements AppBarLayout.OnOffsetChangedListener, OnBookmarkSelectedListener, SessionsListAdapter.OnItemClickListener {
 
@@ -296,14 +294,6 @@ private void loadData() {
         });
     }
 
-    //TODO: High Priority: Remove event bus pattern
-    @Subscribe
-    public void onBookmarksChanged(BookmarkChangedEvent bookmarkChangedEvent) {
-        Timber.d("Bookmarks Changed");
-        loadData();
-    }
-
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -316,7 +306,6 @@ protected void onResume() {
 
         gridLayoutManager.setSpanCount(spanCount);
 
-        //TODO: Workaround. Needs fix during implementation of RealmLiveData
         loadData();
     }
 

diff --git a/android/app/src/main/java/org/fossasia/openevent/core/speaker/SpeakerDetailsViewModel.java b/android/app/src/main/java/org/fossasia/openevent/core/speaker/SpeakerDetailsViewModel.java
@@ -4,7 +4,7 @@
 import android.arch.lifecycle.Transformations;
 import android.arch.lifecycle.ViewModel;
 
-import org.fossasia.openevent.common.arch.LiveRealmDataObject;
+import org.fossasia.openevent.common.arch.LiveRealmData;
 import org.fossasia.openevent.data.Speaker;
 import org.fossasia.openevent.data.repository.RealmDataRepository;
 
@@ -18,8 +18,8 @@ public SpeakerDetailsViewModel() {
 
     public LiveData<Speaker> getSpeaker(String speakerName) {
         if (speaker == null) {
-            LiveRealmDataObject<Speaker> liveRealmDataObject = RealmDataRepository.asLiveDataForObject(realmRepo.getSpeaker(speakerName));
-            speaker = Transformations.map(liveRealmDataObject, input -> input);
+            LiveRealmData<Speaker> liveRealmDataObject = RealmDataRepository.asLiveData(realmRepo.getSpeakersForName(speakerName));
+            speaker = Transformations.map(liveRealmDataObject, input -> input.first());
         }
         return speaker;
     }

diff --git a/android/app/src/main/java/org/fossasia/openevent/data/repository/RealmDataRepository.java b/android/app/src/main/java/org/fossasia/openevent/data/repository/RealmDataRepository.java
@@ -460,6 +460,10 @@ public Speaker getSpeaker(String speakerName) {
         return realm.where(Speaker.class).equalTo("name", speakerName).findFirstAsync();
     }
 
+    public RealmResults<Speaker> getSpeakersForName(String speakerName){
+        return realm.where(Speaker.class).equalTo("name", speakerName).findAllAsync();
+    }
+
     public RealmResults<Speaker> getSpeakers(String sortCriteria) {
         return realm.where(Speaker.class).findAllSortedAsync(sortCriteria);
     }