Merge pull request #370 from jogrimst/master

#366 Fetch Audio by title
elimu-ai · Feb 25, 2017 · e8baf89 · e8baf89
2 parents c220644 + f22f6f4
commit e8baf89
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.literacyapp"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1005003
-        versionName "1.5.3"
+        versionCode 1005004
+        versionName "1.5.4"
 
 //        jackOptions {
 //            enabled true

diff --git a/app/src/main/java/org/literacyapp/MainActivity.java b/app/src/main/java/org/literacyapp/MainActivity.java
@@ -11,15 +11,12 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import org.literacyapp.contentprovider.ContentProvider;
 import org.literacyapp.contentprovider.dao.LetterDao;
-import org.literacyapp.contentprovider.model.content.Letter;
 import org.literacyapp.service.synchronization.ReadDeviceAsyncTask;
 import org.literacyapp.util.ConnectivityHelper;
 import org.literacyapp.util.RootHelper;
 
 import java.io.IOException;
-import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -63,9 +60,9 @@ protected void onStart() {
         LiteracyApplication literacyApplication = (LiteracyApplication) getApplication();
         letterDao = literacyApplication.getDaoSession().getLetterDao();
 
-        ContentProvider.initializeDb(this);
-        List<Letter> letters = ContentProvider.getUnlockedLetters();
-        Log.i(getClass().getName(), "letters: " + letters);
+//        ContentProvider.initializeDb(this);
+//        List<Letter> letters = ContentProvider.getUnlockedLetters();
+//        Log.i(getClass().getName(), "letters: " + letters);
 
         if (letterDao.loadAll().isEmpty()) {
             // Download content

diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1005003
-        versionName "1.5.3"
+        versionCode 1005004
+        versionName "1.5.4"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/contentprovider/src/main/java/org/literacyapp/contentprovider/ContentProvider.java b/contentprovider/src/main/java/org/literacyapp/contentprovider/ContentProvider.java
@@ -175,6 +175,18 @@ public static List<Audio> getAllAudios() {
 
         return audios;
     }
+
+    public static Audio getAudio(String title) {
+        Log.i(ContentProvider.class.getName(), "getAudio");
+
+        AudioDao audioDao = daoSession.getAudioDao();
+
+        Audio audio = audioDao.queryBuilder()
+                .where(AudioDao.Properties.Transcription.eq(title))
+                .unique();
+
+        return audio;
+    }
 
     public static List<Image> getAllImages() {
         Log.i(ContentProvider.class.getName(), "getUnlockedNumbers");