Fixed dependencies , opened db before using

fedepaol · Dec 31, 2015 · 5083185 · 5083185
1 parent 120ff8d
commit 5083185
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,8 +10,10 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".NonCachedActivity"/>
+        <activity android:name=".CachedActivity"/>
         <activity
-            android:name=".NonCachedActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/whiterabbit/rxrestsample/CachedRepoDbObservable.java b/app/src/main/java/com/whiterabbit/rxrestsample/CachedRepoDbObservable.java
@@ -18,7 +18,6 @@
 package com.whiterabbit.rxrestsample;
 
 import android.app.Application;
-import android.content.Context;
 
 import com.whiterabbit.rxrestsample.data.Repo;
 import com.whiterabbit.rxrestsample.data.RepoDbObservable;
@@ -33,12 +32,16 @@
 import rx.subjects.BehaviorSubject;
 
 public class CachedRepoDbObservable {
-    @Inject GitHubClient mClient;
-    @Inject RepoDbObservable mDatabase;
-    @Inject Application mApplication;
+    @Inject
+    GitHubClient mClient;
+    @Inject
+    RepoDbObservable mDatabase;
+    @Inject
+    Application mApplication;
 
     private BehaviorSubject<String> mRestSubject;
 
+    @Inject
     public CachedRepoDbObservable() {
         mRestSubject = BehaviorSubject.create();
     }

diff --git a/app/src/main/java/com/whiterabbit/rxrestsample/MainActivity.java b/app/src/main/java/com/whiterabbit/rxrestsample/MainActivity.java
@@ -42,7 +42,7 @@ public void startUncachedActivity(View view) {
 
     @OnClick(R.id.activity_list_cached_button)
     public void startCachedActivity(View view) {
-        Intent i = new Intent(this, NonCachedActivity.class);
+        Intent i = new Intent(this, CachedActivity.class);
         startActivity(i);
     }
 

diff --git a/app/src/main/java/com/whiterabbit/rxrestsample/data/RepoDbHelper.java b/app/src/main/java/com/whiterabbit/rxrestsample/data/RepoDbHelper.java
@@ -53,6 +53,11 @@ public RepoDbHelper open() throws SQLException {
         mDb = mDbHelper.getWritableDatabase();
         return this;
     }
+
+    public RepoDbHelper openForRead() throws SQLException {
+        mDb = mDbHelper.getReadableDatabase();
+        return this;
+    }
 
     public void close() {
         mDb.close();

diff --git a/app/src/main/java/com/whiterabbit/rxrestsample/data/RepoDbObservable.java b/app/src/main/java/com/whiterabbit/rxrestsample/data/RepoDbObservable.java
@@ -39,7 +39,8 @@ public Observable<List<Repo>> getObservable() {
     }
 
     private List<Repo> getAllReposFromDb() {
-       List<Repo> repos = new ArrayList<>();
+        mDbHelper.openForRead();
+        List<Repo> repos = new ArrayList<>();
         Cursor c = mDbHelper.getAllRepo();
         c.moveToFirst();
         while (c.moveToNext()) {
@@ -50,18 +51,21 @@ private List<Repo> getAllReposFromDb() {
                                               "", "", "")));
         }
         c.close();
+        mDbHelper.close();
         return repos;
     }
 
     public void insertRepoList(List<Repo> repos) {
         // This could have been done inside a transaction + yieldIfContendedSafely
+        mDbHelper.open();
         mDbHelper.removeAllRepo();
         for (Repo r : repos) {
             mDbHelper.addRepo(r.getId(),
                               r.getName(),
                               r.getFullName(),
                               r.getOwner().getLogin());
         }
+        mDbHelper.close();
         mSubject.onNext(repos);
     }
 
@@ -70,11 +74,13 @@ public void propagateError(Throwable e) {
     }
 
     public void insertRepo(Repo r) {
+        mDbHelper.open();
         mDbHelper.addRepo(r.getId(),
                 r.getName(),
                 r.getFullName(),
                 r.getOwner().getLogin());
 
+        mDbHelper.close();
 
         List<Repo> result = getAllReposFromDb();
         mSubject.onNext(result);

diff --git a/app/src/main/java/com/whiterabbit/rxrestsample/inject/InjectModule.java b/app/src/main/java/com/whiterabbit/rxrestsample/inject/InjectModule.java
@@ -49,12 +49,6 @@ Application provideApplication() {
     }
 
     @Provides
-    CachedRepoDbObservable provideCachedObservable() {
-        return new CachedRepoDbObservable();
-    }
-
-    @Provides
-    @Singleton
     RepoDbObservable provideRepoDbObservable() {
         return new RepoDbObservable(mApp.getApplicationContext());
     }