From a5d2c9cdf72203eeb26c7535be37b254a20b386f Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:13:34 +0700
Subject: [PATCH 1/6] refactor: remove audio - content provider

#161
---
 app/src/main/AndroidManifest.xml              |   5 -
 .../provider/AudioContentProvider.java        | 170 ------------------
 2 files changed, 175 deletions(-)
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/provider/AudioContentProvider.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21d1c270..7f8b1068 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,11 +59,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/image_file_path"/>
         </provider>
-        <provider
-            android:name=".provider.AudioContentProvider"
-            android:authorities="${applicationId}.provider.audio_provider"
-            android:enabled="true"
-            android:exported="true" />
         <provider
             android:name=".provider.StoryBookContentProvider"
             android:authorities="${applicationId}.provider.storybook_provider"
diff --git a/app/src/main/java/ai/elimu/content_provider/provider/AudioContentProvider.java b/app/src/main/java/ai/elimu/content_provider/provider/AudioContentProvider.java
deleted file mode 100644
index 2b83135b..00000000
--- a/app/src/main/java/ai/elimu/content_provider/provider/AudioContentProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package ai.elimu.content_provider.provider;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import java.util.List;
-
-import ai.elimu.content_provider.BuildConfig;
-import ai.elimu.content_provider.room.dao.AudioDao;
-import ai.elimu.content_provider.room.db.RoomDb;
-
-public class AudioContentProvider extends ContentProvider {
-
-    public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".provider.audio_provider";
-
-    private static final String TABLE_AUDIOS = "audios";
-    private static final int CODE_AUDIOS = 1;
-    private static final int CODE_AUDIO_ID = 2;
-    private static final int CODE_AUDIO_TRANSCRIPTION = 3;
-    private static final int CODE_AUDIO_TITLE = 4;
-
-    private static final UriMatcher MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
-
-    static {
-        MATCHER.addURI(AUTHORITY, TABLE_AUDIOS, CODE_AUDIOS);
-        MATCHER.addURI(AUTHORITY, TABLE_AUDIOS + "/#", CODE_AUDIO_ID);
-        MATCHER.addURI(AUTHORITY, TABLE_AUDIOS + "/by-transcription/*", CODE_AUDIO_TRANSCRIPTION);
-        MATCHER.addURI(AUTHORITY, TABLE_AUDIOS + "/by-title/*", CODE_AUDIO_TITLE);
-    }
-
-    @Override
-    public boolean onCreate() {
-        Log.i(getClass().getName(), "onCreate");
-
-        return true;
-    }
-
-    /**
-     * Handles query requests from clients.
-     */
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        Log.i(getClass().getName(), "query");
-
-        Log.i(getClass().getName(), "uri: " + uri);
-        Log.i(getClass().getName(), "projection: " + projection);
-        Log.i(getClass().getName(), "selection: " + selection);
-        Log.i(getClass().getName(), "selectionArgs: " + selectionArgs);
-        Log.i(getClass().getName(), "sortOrder: " + sortOrder);
-
-        Context context = getContext();
-        Log.i(getClass().getName(), "context: " + context);
-        if (context == null) {
-            return null;
-        }
-
-        RoomDb roomDb = RoomDb.getDatabase(context);
-        AudioDao audioDao = roomDb.audioDao();
-
-        final int code = MATCHER.match(uri);
-        Log.i(getClass().getName(), "code: " + code);
-        if (code == CODE_AUDIOS) {
-            final Cursor cursor;
-
-            // Get the Room Cursor
-            cursor = audioDao.loadAllAsCursor();
-            Log.i(getClass().getName(), "cursor: " + cursor);
-
-            cursor.setNotificationUri(context.getContentResolver(), uri);
-
-            return cursor;
-        } else if (code == CODE_AUDIO_ID) {
-            // Extract the Audio ID from the URI
-            List<String> pathSegments = uri.getPathSegments();
-            Log.i(getClass().getName(), "pathSegments: " + pathSegments);
-            String audioIdAsString = pathSegments.get(1);
-            Long audioId = Long.valueOf(audioIdAsString);
-            Log.i(getClass().getName(), "audioId: " + audioId);
-
-            final Cursor cursor;
-
-            // Get the Room Cursor
-            cursor = audioDao.loadAsCursor(audioId);
-            Log.i(getClass().getName(), "cursor: " + cursor);
-
-            cursor.setNotificationUri(context.getContentResolver(), uri);
-
-            return cursor;
-        } else if (code == CODE_AUDIO_TRANSCRIPTION) {
-            // Extract the transcription from the URI
-            List<String> pathSegments = uri.getPathSegments();
-            Log.i(getClass().getName(), "pathSegments: " + pathSegments);
-            String transcription = pathSegments.get(2);
-            Log.i(getClass().getName(), "transcription: \"" + transcription + "\"");
-
-            final Cursor cursor;
-
-            // Get the Room Cursor
-            cursor = audioDao.loadByTranscriptionAsCursor(transcription);
-            Log.i(getClass().getName(), "cursor: " + cursor);
-
-            cursor.setNotificationUri(context.getContentResolver(), uri);
-
-            return cursor;
-        } else if (code == CODE_AUDIO_TITLE) {
-            // Extract the transcription from the URI
-            List<String> pathSegments = uri.getPathSegments();
-            Log.i(getClass().getName(), "pathSegments: " + pathSegments);
-            String title = pathSegments.get(2);
-            Log.i(getClass().getName(), "title: \"" + title + "\"");
-
-            final Cursor cursor;
-
-            // Get the Room Cursor
-            cursor = audioDao.loadByTitleAsCursor(title);
-            Log.i(getClass().getName(), "cursor: " + cursor);
-
-            cursor.setNotificationUri(context.getContentResolver(), uri);
-
-            return cursor;
-        } else {
-            throw new IllegalArgumentException("Unknown URI: " + uri);
-        }
-    }
-
-    /**
-     * Handles requests for the MIME type of the data at the given URI.
-     */
-    @Override
-    public String getType(Uri uri) {
-        Log.i(getClass().getName(), "getType");
-
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    /**
-     * Handles requests to insert a new row.
-     */
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        Log.i(getClass().getName(), "insert");
-
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    /**
-     * Handles requests to update one or more rows.
-     */
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        Log.i(getClass().getName(), "update");
-
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    /**
-     * Handle requests to delete one or more rows.
-     */
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        Log.i(getClass().getName(), "delete");
-
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-}

From e26746b7c717144e1756fb41ced1ebea53ca7bb9 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:20:20 +0700
Subject: [PATCH 2/6] refactor: remove audio - ui fragment

#161
---
 .../elimu/content_provider/MainActivity.java  |   1 -
 .../ui/audio/AudiosFragment.java              | 177 ------------------
 .../ui/audio/AudiosViewModel.java             |  19 --
 app/src/main/res/layout/fragment_audios.xml   |  29 ---
 .../main/res/menu/activity_main_drawer.xml    |   4 -
 .../main/res/navigation/mobile_navigation.xml |   6 -
 app/src/main/res/values/strings.xml           |   1 -
 7 files changed, 237 deletions(-)
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosFragment.java
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosViewModel.java
 delete mode 100644 app/src/main/res/layout/fragment_audios.xml

diff --git a/app/src/main/java/ai/elimu/content_provider/MainActivity.java b/app/src/main/java/ai/elimu/content_provider/MainActivity.java
index f5c6cd08..eedbff7c 100644
--- a/app/src/main/java/ai/elimu/content_provider/MainActivity.java
+++ b/app/src/main/java/ai/elimu/content_provider/MainActivity.java
@@ -58,7 +58,6 @@ protected void onCreate(Bundle savedInstanceState) {
                             R.id.nav_numbers,
                             R.id.nav_emojis,
                             R.id.nav_images,
-                            R.id.nav_audios,
                             R.id.nav_storybooks,
                             R.id.nav_videos
                     )
diff --git a/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosFragment.java b/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosFragment.java
deleted file mode 100644
index 2b3fc29e..00000000
--- a/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosFragment.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package ai.elimu.content_provider.ui.audio;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import ai.elimu.content_provider.BaseApplication;
-import ai.elimu.content_provider.R;
-import ai.elimu.content_provider.rest.AudiosService;
-import ai.elimu.content_provider.room.GsonToRoomConverter;
-import ai.elimu.content_provider.room.dao.AudioDao;
-import ai.elimu.content_provider.room.db.RoomDb;
-import ai.elimu.content_provider.room.entity.Audio;
-import ai.elimu.content_provider.util.FileHelper;
-import ai.elimu.content_provider.util.MultimediaDownloader;
-import ai.elimu.model.v2.gson.content.AudioGson;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-
-public class AudiosFragment extends Fragment {
-
-    private AudiosViewModel audiosViewModel;
-
-    private ProgressBar progressBar;
-
-    private TextView textView;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        Log.i(getClass().getName(), "onCreateView");
-
-        audiosViewModel = new ViewModelProvider(this).get(AudiosViewModel.class);
-        View root = inflater.inflate(R.layout.fragment_audios, container, false);
-        progressBar = root.findViewById(R.id.progress_bar_audios);
-        textView = root.findViewById(R.id.text_audios);
-        audiosViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
-            @Override
-            public void onChanged(@Nullable String s) {
-                Log.i(getClass().getName(), "onChanged");
-                textView.setText(s);
-            }
-        });
-        return root;
-    }
-
-    @Override
-    public void onStart() {
-        Log.i(getClass().getName(), "onStart");
-        super.onStart();
-
-        // Download Audios from REST API, and store them in the database
-        BaseApplication baseApplication = (BaseApplication) getActivity().getApplication();
-        Retrofit retrofit = baseApplication.getRetrofit();
-        AudiosService audiosService = retrofit.create(AudiosService.class);
-        Call<List<AudioGson>> audioGsonsCall = audiosService.listAudios();
-        Log.i(getClass().getName(), "audioGsonsCall.request(): " + audioGsonsCall.request());
-        audioGsonsCall.enqueue(new Callback<List<AudioGson>>() {
-
-            @Override
-            public void onResponse(Call<List<AudioGson>> call, Response<List<AudioGson>> response) {
-                Log.i(getClass().getName(), "onResponse");
-
-                Log.i(getClass().getName(), "response: " + response);
-                if (response.isSuccessful()) {
-                    List<AudioGson> audioGsons = response.body();
-                    Log.i(getClass().getName(), "audioGsons.size(): " + audioGsons.size());
-
-                    if (audioGsons.size() > 0) {
-                        processResponseBody(audioGsons);
-                    }
-                } else {
-                    // Handle error
-                    Snackbar.make(textView, response.toString(), Snackbar.LENGTH_LONG)
-                            .setBackgroundTint(getResources().getColor(R.color.deep_orange_darken_4))
-                            .show();
-                    progressBar.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void onFailure(Call<List<AudioGson>> call, Throwable t) {
-                Log.e(getClass().getName(), "onFailure", t);
-
-                Log.e(getClass().getName(), "t.getCause():", t.getCause());
-
-                // Handle error
-                Snackbar.make(textView, t.getCause().toString(), Snackbar.LENGTH_LONG)
-                        .setBackgroundTint(getResources().getColor(R.color.deep_orange_darken_4))
-                        .show();
-                progressBar.setVisibility(View.GONE);
-            }
-        });
-    }
-
-    private void processResponseBody(List<AudioGson> audioGsons) {
-        Log.i(getClass().getName(), "processResponseBody");
-
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-        executorService.execute(new Runnable() {
-            @Override
-            public void run() {
-                Log.i(getClass().getName(), "run");
-
-                RoomDb roomDb = RoomDb.getDatabase(getContext());
-                AudioDao audioDao = roomDb.audioDao();
-
-                // Empty the database table before downloading up-to-date content
-                audioDao.deleteAll();
-                // TODO: also delete corresponding audio files (only those that are no longer used)
-
-                for (AudioGson audioGson : audioGsons) {
-                    Log.i(getClass().getName(), "audioGson.getId(): " + audioGson.getId());
-
-                    Audio audio = GsonToRoomConverter.getAudio(audioGson);
-
-                    // Check if the corresponding audio file has already been downloaded
-                    File audioFile = FileHelper.getAudioFile(audioGson, getContext());
-                    Log.i(getClass().getName(), "audioFile: " + audioFile);
-                    Log.i(getClass().getName(), "audioFile.exists(): " + audioFile.exists());
-                    if (!audioFile.exists()) {
-                        // Download file bytes
-                        BaseApplication baseApplication = (BaseApplication) getActivity().getApplication();
-                        String downloadUrl = baseApplication.getBaseUrl() + audioGson.getBytesUrl();
-                        Log.i(getClass().getName(), "downloadUrl: " + downloadUrl);
-                        byte[] bytes = MultimediaDownloader.downloadFileBytes(downloadUrl);
-                        Log.i(getClass().getName(), "bytes.length: " + bytes.length);
-
-                        // Store the downloaded file in the external storage directory
-                        try {
-                            FileOutputStream fileOutputStream = new FileOutputStream(audioFile);
-                            fileOutputStream.write(bytes);
-                        } catch (FileNotFoundException e) {
-                            Log.e(getClass().getName(), null, e);
-                        } catch (IOException e) {
-                            Log.e(getClass().getName(), null, e);
-                        }
-                        Log.i(getClass().getName(), "audioFile.exists(): " + audioFile.exists());
-                    }
-
-                    // Store the Audio in the database
-                    audioDao.insert(audio);
-                    Log.i(getClass().getName(), "Stored Audio in database with ID " + audio.getId());
-                }
-
-                // Update the UI
-                List<Audio> audios = audioDao.loadAll();
-                Log.i(getClass().getName(), "audios.size(): " + audios.size());
-                getActivity().runOnUiThread(() -> {
-                    textView.setText("audios.size(): " + audios.size());
-                    Snackbar.make(textView, "audios.size(): " + audios.size(), Snackbar.LENGTH_LONG).show();
-                    progressBar.setVisibility(View.GONE);
-                });
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosViewModel.java b/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosViewModel.java
deleted file mode 100644
index 6ea3ee75..00000000
--- a/app/src/main/java/ai/elimu/content_provider/ui/audio/AudiosViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ai.elimu.content_provider.ui.audio;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class AudiosViewModel extends ViewModel {
-
-    private MutableLiveData<String> text;
-
-    public AudiosViewModel() {
-        text = new MutableLiveData<>();
-        text.setValue("AudiosViewModel");
-    }
-
-    public LiveData<String> getText() {
-        return text;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_audios.xml b/app/src/main/res/layout/fragment_audios.xml
deleted file mode 100644
index 8f6cbec7..00000000
--- a/app/src/main/res/layout/fragment_audios.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin">
-
-    <ProgressBar
-        android:id="@+id/progress_bar_audios"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
-
-    <TextView
-        android:id="@+id/text_audios"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 0a429f49..54b085ac 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -48,10 +48,6 @@
                     android:id="@+id/nav_images"
                     android:icon="@drawable/ic_menu_image"
                     android:title="@string/menu_images" />
-                <item
-                    android:id="@+id/nav_audios"
-                    android:icon="@drawable/ic_menu_audiotrack"
-                    android:title="@string/menu_audios" />
                 <item
                     android:id="@+id/nav_storybooks"
                     android:icon="@drawable/ic_menu_book"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 2e506743..e968d1b6 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -53,12 +53,6 @@
         android:label="@string/menu_images"
         tools:layout="@layout/fragment_images" />
 
-    <fragment
-        android:id="@+id/nav_audios"
-        android:name="ai.elimu.content_provider.ui.audio.AudiosFragment"
-        android:label="@string/menu_audios"
-        tools:layout="@layout/fragment_audios" />
-
     <fragment
         android:id="@+id/nav_storybooks"
         android:name="ai.elimu.content_provider.ui.storybook.StoryBooksFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49fd9cf7..3d7fd332 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,6 @@
     <string name="menu_numbers">Numbers</string>
     <string name="menu_emojis">Emojis</string>
     <string name="menu_images">Images</string>
-    <string name="menu_audios">Audios</string>
     <string name="menu_storybooks">Storybooks</string>
     <string name="menu_videos">Videos</string>
 </resources>

From 8816ec16376be6b29c82167a3a1c63c8f19f751f Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:22:23 +0700
Subject: [PATCH 3/6] refactor: remove audio - rest service

#161
---
 .../elimu/content_provider/rest/AudiosService.java  | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/rest/AudiosService.java

diff --git a/app/src/main/java/ai/elimu/content_provider/rest/AudiosService.java b/app/src/main/java/ai/elimu/content_provider/rest/AudiosService.java
deleted file mode 100644
index 53095e42..00000000
--- a/app/src/main/java/ai/elimu/content_provider/rest/AudiosService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ai.elimu.content_provider.rest;
-
-import java.util.List;
-
-import ai.elimu.model.v2.gson.content.AudioGson;
-import retrofit2.Call;
-import retrofit2.http.GET;
-
-public interface AudiosService {
-
-    @GET("content/audios")
-    Call<List<AudioGson>> listAudios();
-}

From 74271271c6c0f0b99acfcdfc3c4344d66124cd16 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:27:51 +0700
Subject: [PATCH 4/6] refactor: remove audio - dao

#161
---
 .../content_provider/room/dao/AudioDao.java   | 49 -------------------
 .../content_provider/room/db/RoomDb.java      |  3 --
 2 files changed, 52 deletions(-)
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/room/dao/AudioDao.java

diff --git a/app/src/main/java/ai/elimu/content_provider/room/dao/AudioDao.java b/app/src/main/java/ai/elimu/content_provider/room/dao/AudioDao.java
deleted file mode 100644
index e40b1b37..00000000
--- a/app/src/main/java/ai/elimu/content_provider/room/dao/AudioDao.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ai.elimu.content_provider.room.dao;
-
-import android.database.Cursor;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-import ai.elimu.content_provider.room.entity.Audio;
-
-@Dao
-public interface AudioDao {
-
-    @Insert
-    void insert(Audio audio);
-
-    @Query("SELECT * FROM Audio WHERE id = :id")
-    Audio load(Long id);
-
-    @Query("SELECT * FROM Audio WHERE id = :id")
-    Cursor loadAsCursor(Long id);
-
-    @Query("SELECT * FROM Audio WHERE transcription = :transcription")
-    Audio loadByTranscription(String transcription);
-
-    @Query("SELECT * FROM Audio WHERE transcription = :transcription")
-    Cursor loadByTranscriptionAsCursor(String transcription);
-
-    @Query("SELECT * FROM Audio WHERE title = :title")
-    Audio loadByTitle(String title);
-
-    @Query("SELECT * FROM Audio WHERE title = :title")
-    Cursor loadByTitleAsCursor(String title);
-
-    @Query("SELECT * FROM Audio")
-    List<Audio> loadAll();
-
-    @Query("SELECT * FROM Audio")
-    Cursor loadAllAsCursor();
-
-    @Update
-    void update(Audio audio);
-
-    @Query("DELETE FROM Audio")
-    void deleteAll();
-}
diff --git a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
index 53ffa410..114f3c92 100644
--- a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
+++ b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
@@ -17,7 +17,6 @@
 import ai.elimu.content_provider.room.dao.LetterSound_LetterDao;
 import ai.elimu.content_provider.room.dao.LetterSound_SoundDao;
 import ai.elimu.content_provider.room.dao.SoundDao;
-import ai.elimu.content_provider.room.dao.AudioDao;
 import ai.elimu.content_provider.room.dao.EmojiDao;
 import ai.elimu.content_provider.room.dao.Emoji_WordDao;
 import ai.elimu.content_provider.room.dao.ImageDao;
@@ -74,8 +73,6 @@ public abstract class RoomDb extends RoomDatabase {
 
     public abstract Image_WordDao image_WordDao();
 
-    public abstract AudioDao audioDao();
-
     public abstract StoryBookDao storyBookDao();
 
     public abstract StoryBookChapterDao storyBookChapterDao();

From 08bd0766abf2f044836e31522c14fda66a4012cd Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:40:28 +0700
Subject: [PATCH 5/6] refactor: remove audio - db entity

#161
---
 .../26.json                                   |  54 +-------
 .../room/GsonToRoomConverter.java             |  24 ----
 .../content_provider/room/db/Converters.java  |  17 ---
 .../content_provider/room/db/RoomDb.java      |   3 +-
 .../content_provider/room/entity/Audio.java   |  46 -------
 .../content_provider/util/FileHelper.java     |  10 --
 gradle/libs.versions.toml                     |   2 +-
 .../utils/ContentProviderUtil.kt              | 128 ------------------
 .../converter/CursorToAudioGsonConverter.java |  49 -------
 9 files changed, 4 insertions(+), 329 deletions(-)
 delete mode 100644 app/src/main/java/ai/elimu/content_provider/room/entity/Audio.java
 delete mode 100644 utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToAudioGsonConverter.java

diff --git a/app/schemas/ai.elimu.content_provider.room.db.RoomDb/26.json b/app/schemas/ai.elimu.content_provider.room.db.RoomDb/26.json
index e4efe9ec..7ad9bace 100644
--- a/app/schemas/ai.elimu.content_provider.room.db.RoomDb/26.json
+++ b/app/schemas/ai.elimu.content_provider.room.db.RoomDb/26.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 26,
-    "identityHash": "59e65b275fee9665d0c18eb2d49f6a3a",
+    "identityHash": "0f15f0f2b2fa7d5262a10c32eb16e440",
     "entities": [
       {
         "tableName": "Letter",
@@ -414,56 +414,6 @@
         "indices": [],
         "foreignKeys": []
       },
-      {
-        "tableName": "Audio",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `transcription` TEXT NOT NULL, `audioFormat` TEXT NOT NULL, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "transcription",
-            "columnName": "transcription",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "audioFormat",
-            "columnName": "audioFormat",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "revisionNumber",
-            "columnName": "revisionNumber",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usageCount",
-            "columnName": "usageCount",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
       {
         "tableName": "StoryBook",
         "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `description` TEXT, `coverImageId` INTEGER NOT NULL, `readingLevel` TEXT, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
@@ -677,7 +627,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '59e65b275fee9665d0c18eb2d49f6a3a')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0f15f0f2b2fa7d5262a10c32eb16e440')"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ai/elimu/content_provider/room/GsonToRoomConverter.java b/app/src/main/java/ai/elimu/content_provider/room/GsonToRoomConverter.java
index e63c6889..f5dcff94 100644
--- a/app/src/main/java/ai/elimu/content_provider/room/GsonToRoomConverter.java
+++ b/app/src/main/java/ai/elimu/content_provider/room/GsonToRoomConverter.java
@@ -2,7 +2,6 @@
 
 import ai.elimu.content_provider.room.entity.LetterSound;
 import ai.elimu.content_provider.room.entity.Sound;
-import ai.elimu.content_provider.room.entity.Audio;
 import ai.elimu.content_provider.room.entity.Emoji;
 import ai.elimu.content_provider.room.entity.Image;
 import ai.elimu.content_provider.room.entity.Letter;
@@ -14,7 +13,6 @@
 import ai.elimu.content_provider.room.entity.Word;
 import ai.elimu.model.v2.gson.content.LetterSoundGson;
 import ai.elimu.model.v2.gson.content.SoundGson;
-import ai.elimu.model.v2.gson.content.AudioGson;
 import ai.elimu.model.v2.gson.content.EmojiGson;
 import ai.elimu.model.v2.gson.content.ImageGson;
 import ai.elimu.model.v2.gson.content.LetterGson;
@@ -177,28 +175,6 @@ public static Image getImage(ImageGson imageGson) {
         }
     }
 
-    public static Audio getAudio(AudioGson audioGson) {
-        if (audioGson == null) {
-            return null;
-        } else {
-            Audio audio = new Audio();
-
-            // BaseEntity
-            audio.setId(audioGson.getId());
-
-            // Content
-            audio.setRevisionNumber(audioGson.getRevisionNumber());
-            audio.setUsageCount(audioGson.getUsageCount());
-
-            // Audio
-            audio.setTitle(audioGson.getTitle());
-            audio.setTranscription(audioGson.getTranscription());
-            audio.setAudioFormat(audioGson.getAudioFormat());
-
-            return audio;
-        }
-    }
-
     public static StoryBook getStoryBook(StoryBookGson storyBookGson) {
         if (storyBookGson == null) {
             return null;
diff --git a/app/src/main/java/ai/elimu/content_provider/room/db/Converters.java b/app/src/main/java/ai/elimu/content_provider/room/db/Converters.java
index ca5097cd..d4b33923 100644
--- a/app/src/main/java/ai/elimu/content_provider/room/db/Converters.java
+++ b/app/src/main/java/ai/elimu/content_provider/room/db/Converters.java
@@ -5,7 +5,6 @@
 import androidx.room.TypeConverter;
 
 import ai.elimu.model.v2.enums.ReadingLevel;
-import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.VideoFormat;
 import ai.elimu.model.v2.enums.content.WordType;
@@ -31,22 +30,6 @@ public static String toString(ImageFormat imageFormat) {
     }
 
 
-    @TypeConverter
-    public static AudioFormat fromAudioFormat(String value) {
-        AudioFormat audioFormat = null;
-        if (!TextUtils.isEmpty(value)) {
-            audioFormat = AudioFormat.valueOf(value);
-        }
-        return audioFormat;
-    }
-
-    @TypeConverter
-    public static String toString(AudioFormat audioFormat) {
-        String value = audioFormat.toString();
-        return value;
-    }
-
-
     @TypeConverter
     public static VideoFormat fromVideoFormat(String value) {
         VideoFormat videoFormat = null;
diff --git a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
index 114f3c92..6d6ac698 100644
--- a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
+++ b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
@@ -33,7 +33,6 @@
 import ai.elimu.content_provider.room.entity.LetterSound_Letter;
 import ai.elimu.content_provider.room.entity.LetterSound_Sound;
 import ai.elimu.content_provider.room.entity.Sound;
-import ai.elimu.content_provider.room.entity.Audio;
 import ai.elimu.content_provider.room.entity.Emoji;
 import ai.elimu.content_provider.room.entity.Emoji_Word;
 import ai.elimu.content_provider.room.entity.Image;
@@ -47,7 +46,7 @@
 import ai.elimu.content_provider.room.entity.Video;
 import ai.elimu.content_provider.room.entity.Word;
 
-@Database(version = 26, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, Audio.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
+@Database(version = 26, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
 @TypeConverters({Converters.class})
 public abstract class RoomDb extends RoomDatabase {
 
diff --git a/app/src/main/java/ai/elimu/content_provider/room/entity/Audio.java b/app/src/main/java/ai/elimu/content_provider/room/entity/Audio.java
deleted file mode 100644
index b9141727..00000000
--- a/app/src/main/java/ai/elimu/content_provider/room/entity/Audio.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ai.elimu.content_provider.room.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-
-import ai.elimu.model.v2.enums.content.AudioFormat;
-
-/**
- * For documentation, see https://github.com/elimu-ai/webapp/tree/main/src/main/java/ai/elimu/model
- */
-@Entity
-public class Audio extends Content {
-
-    @NonNull
-    private String title;
-
-    @NonNull
-    private String transcription;
-
-    @NonNull
-    private AudioFormat audioFormat;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTranscription() {
-        return transcription;
-    }
-
-    public void setTranscription(String transcription) {
-        this.transcription = transcription;
-    }
-
-    public AudioFormat getAudioFormat() {
-        return audioFormat;
-    }
-
-    public void setAudioFormat(AudioFormat audioFormat) {
-        this.audioFormat = audioFormat;
-    }
-}
diff --git a/app/src/main/java/ai/elimu/content_provider/util/FileHelper.java b/app/src/main/java/ai/elimu/content_provider/util/FileHelper.java
index 369b7de4..0aff6aaa 100644
--- a/app/src/main/java/ai/elimu/content_provider/util/FileHelper.java
+++ b/app/src/main/java/ai/elimu/content_provider/util/FileHelper.java
@@ -8,7 +8,6 @@
 import java.io.File;
 
 import ai.elimu.content_provider.room.entity.Image;
-import ai.elimu.model.v2.gson.content.AudioGson;
 import ai.elimu.model.v2.gson.content.ImageGson;
 import ai.elimu.model.v2.gson.content.VideoGson;
 
@@ -38,15 +37,6 @@ public static File getImageFile(Image imageGson, Context context) {
                 + imageGson.getImageFormat().toString().toLowerCase());
     }
 
-    public static File getAudioFile(AudioGson audioGson, Context context) {
-        if ((audioGson.getId() == null) || (audioGson.getRevisionNumber() == null)) {
-            return null;
-        }
-        File audiosDirectory = context.getExternalFilesDir(Environment.DIRECTORY_MUSIC);
-        File file = new File(audiosDirectory, audioGson.getId() + "_r" + audioGson.getRevisionNumber() + "." + audioGson.getAudioFormat().toString().toLowerCase());
-        return file;
-    }
-
     public static File getVideoFile(VideoGson videoGson, Context context) {
         if ((videoGson.getId() == null) || (videoGson.getRevisionNumber() == null)) {
             return null;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5162f70f..7aaa565c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-elimuModel = "model-2.0.83"
+elimuModel = "model-2.0.84"
 elimuAnalytics = "3.1.27"
 commonsIo = "2.17.0"
 material = "1.5.0"
diff --git a/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt b/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt
index 77b9043f..03794586 100644
--- a/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt
+++ b/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt
@@ -2,7 +2,6 @@ package ai.elimu.content_provider.utils
 
 import ai.elimu.analytics.utils.EventProviderUtil
 import ai.elimu.analytics.utils.logic.MasteryHelper
-import ai.elimu.content_provider.utils.converter.CursorToAudioGsonConverter
 import ai.elimu.content_provider.utils.converter.CursorToEmojiGsonConverter
 import ai.elimu.content_provider.utils.converter.CursorToImageGsonConverter
 import ai.elimu.content_provider.utils.converter.CursorToLetterGsonConverter
@@ -10,7 +9,6 @@ import ai.elimu.content_provider.utils.converter.CursorToLetterSoundGsonConverte
 import ai.elimu.content_provider.utils.converter.CursorToStoryBookChapterGsonConverter
 import ai.elimu.content_provider.utils.converter.CursorToStoryBookGsonConverter
 import ai.elimu.content_provider.utils.converter.CursorToWordGsonConverter
-import ai.elimu.model.v2.gson.content.AudioGson
 import ai.elimu.model.v2.gson.content.EmojiGson
 import ai.elimu.model.v2.gson.content.ImageGson
 import ai.elimu.model.v2.gson.content.LetterGson
@@ -400,132 +398,6 @@ object ContentProviderUtil {
         return imageGson
     }
 
-    fun getAudioGson(
-        audioId: Long,
-        context: Context,
-        contentProviderApplicationId: String
-    ): AudioGson? {
-        Log.i(ContentProviderUtil::class.java.name, "getAudioGson")
-
-        var audioGson: AudioGson? = null
-
-        val audioUri =
-            Uri.parse("content://$contentProviderApplicationId.provider.audio_provider/audios/$audioId")
-        Log.i(ContentProviderUtil::class.java.name, "audioUri: $audioUri")
-        val audioCursor = context.contentResolver.query(audioUri, null, null, null, null)
-        Log.i(ContentProviderUtil::class.java.name, "audioCursor: $audioCursor")
-        if (audioCursor == null) {
-            Log.e(ContentProviderUtil::class.java.name, "audioCursor == null")
-            Toast.makeText(context, "audioCursor == null", Toast.LENGTH_LONG).show()
-        } else {
-            Log.i(
-                ContentProviderUtil::class.java.name,
-                "audioCursor.getCount(): " + audioCursor.count
-            )
-            if (audioCursor.count == 0) {
-                Log.e(ContentProviderUtil::class.java.name, "audioCursor.getCount() == 0")
-            } else {
-                audioCursor.moveToFirst()
-
-                // Convert from Room to Gson
-                audioGson = CursorToAudioGsonConverter.getAudioGson(audioCursor)
-
-                audioCursor.close()
-                Log.i(
-                    ContentProviderUtil::class.java.name,
-                    "audioCursor.isClosed(): " + audioCursor.isClosed
-                )
-            }
-        }
-        Log.i(ContentProviderUtil::class.java.name, "audioGson: $audioGson")
-
-        return audioGson
-    }
-
-    fun getAudioGsonByTitle(
-        title: String,
-        context: Context,
-        contentProviderApplicationId: String
-    ): AudioGson? {
-        Log.i(ContentProviderUtil::class.java.name, "getAudioGsonByTitle")
-
-        var audioGson: AudioGson? = null
-
-        val audioUri =
-            Uri.parse("content://$contentProviderApplicationId.provider.audio_provider/audios/by-title/$title")
-        Log.i(ContentProviderUtil::class.java.name, "audioUri: $audioUri")
-        val audioCursor = context.contentResolver.query(audioUri, null, null, null, null)
-        Log.i(ContentProviderUtil::class.java.name, "audioCursor: $audioCursor")
-        if (audioCursor == null) {
-            Log.e(ContentProviderUtil::class.java.name, "audioCursor == null")
-            Toast.makeText(context, "audioCursor == null", Toast.LENGTH_LONG).show()
-        } else {
-            Log.i(
-                ContentProviderUtil::class.java.name,
-                "audioCursor.getCount(): " + audioCursor.count
-            )
-            if (audioCursor.count == 0) {
-                Log.e(ContentProviderUtil::class.java.name, "audioCursor.getCount() == 0")
-            } else {
-                audioCursor.moveToFirst()
-
-                // Convert from Room to Gson
-                audioGson = CursorToAudioGsonConverter.getAudioGson(audioCursor)
-
-                audioCursor.close()
-                Log.i(
-                    ContentProviderUtil::class.java.name,
-                    "audioCursor.isClosed(): " + audioCursor.isClosed
-                )
-            }
-        }
-        Log.i(ContentProviderUtil::class.java.name, "audioGson: $audioGson")
-
-        return audioGson
-    }
-
-    fun getAudioGsonByTranscription(
-        transcription: String,
-        context: Context,
-        contentProviderApplicationId: String
-    ): AudioGson? {
-        Log.i(ContentProviderUtil::class.java.name, "getAudioGsonByTranscription")
-
-        var audioGson: AudioGson? = null
-
-        val audioUri =
-            Uri.parse("content://$contentProviderApplicationId.provider.audio_provider/audios/by-transcription/$transcription")
-        Log.i(ContentProviderUtil::class.java.name, "audioUri: $audioUri")
-        val audioCursor = context.contentResolver.query(audioUri, null, null, null, null)
-        Log.i(ContentProviderUtil::class.java.name, "audioCursor: $audioCursor")
-        if (audioCursor == null) {
-            Log.e(ContentProviderUtil::class.java.name, "audioCursor == null")
-            Toast.makeText(context, "audioCursor == null", Toast.LENGTH_LONG).show()
-        } else {
-            Log.i(
-                ContentProviderUtil::class.java.name,
-                "audioCursor.getCount(): " + audioCursor.count
-            )
-            if (audioCursor.count == 0) {
-                Log.e(ContentProviderUtil::class.java.name, "audioCursor.getCount() == 0")
-            } else {
-                audioCursor.moveToFirst()
-
-                // Convert from Room to Gson
-                audioGson = CursorToAudioGsonConverter.getAudioGson(audioCursor)
-
-                audioCursor.close()
-                Log.i(
-                    ContentProviderUtil::class.java.name,
-                    "audioCursor.isClosed(): " + audioCursor.isClosed
-                )
-            }
-        }
-        Log.i(ContentProviderUtil::class.java.name, "audioGson: $audioGson")
-
-        return audioGson
-    }
-
     fun getAllStoryBookGsons(
         context: Context,
         contentProviderApplicationId: String
diff --git a/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToAudioGsonConverter.java b/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToAudioGsonConverter.java
deleted file mode 100644
index 27096c64..00000000
--- a/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToAudioGsonConverter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ai.elimu.content_provider.utils.converter;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import java.util.Arrays;
-
-import ai.elimu.model.v2.enums.content.AudioFormat;
-import ai.elimu.model.v2.gson.content.AudioGson;
-
-public class CursorToAudioGsonConverter {
-
-    public static AudioGson getAudioGson(Cursor cursor) {
-        Log.i(CursorToAudioGsonConverter.class.getName(), "getAudioGson");
-
-        Log.i(CursorToAudioGsonConverter.class.getName(), "Arrays.toString(cursor.getColumnNames()): " + Arrays.toString(cursor.getColumnNames()));
-
-        int columnId = cursor.getColumnIndex("id");
-        Long id = cursor.getLong(columnId);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "id: " + id);
-
-        int columnRevisionNumber = cursor.getColumnIndex("revisionNumber");
-        Integer revisionNumber = cursor.getInt(columnRevisionNumber);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "revisionNumber: " + revisionNumber);
-
-        int columnTitle = cursor.getColumnIndex("title");
-        String title = cursor.getString(columnTitle);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "title: \"" + title + "\"");
-
-        int columnTranscription = cursor.getColumnIndex("transcription");
-        String transcription = cursor.getString(columnTranscription);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "transcription: \"" + transcription + "\"");
-
-        int columnAudioFormat = cursor.getColumnIndex("audioFormat");
-        String audioFormatAsString = cursor.getString(columnAudioFormat);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "audioFormatAsString: " + audioFormatAsString);
-        AudioFormat audioFormat = AudioFormat.valueOf(audioFormatAsString);
-        Log.i(CursorToAudioGsonConverter.class.getName(), "audioFormat: " + audioFormat);
-
-        AudioGson audio = new AudioGson();
-        audio.setId(id);
-        audio.setRevisionNumber(revisionNumber);
-        audio.setTitle(title);
-        audio.setTranscription(transcription);
-        audio.setAudioFormat(audioFormat);
-
-        return audio;
-    }
-}

From bfef0f0e23310c8f01daec73e125d4c9c681e415 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:44:50 +0700
Subject: [PATCH 6/6] refactor: remove audio - db migration

#161
---
 .../27.json                                   | 633 ++++++++++++++++++
 .../content_provider/room/db/RoomDb.java      |  16 +-
 2 files changed, 647 insertions(+), 2 deletions(-)
 create mode 100644 app/schemas/ai.elimu.content_provider.room.db.RoomDb/27.json

diff --git a/app/schemas/ai.elimu.content_provider.room.db.RoomDb/27.json b/app/schemas/ai.elimu.content_provider.room.db.RoomDb/27.json
new file mode 100644
index 00000000..fee8b76c
--- /dev/null
+++ b/app/schemas/ai.elimu.content_provider.room.db.RoomDb/27.json
@@ -0,0 +1,633 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 27,
+    "identityHash": "0f15f0f2b2fa7d5262a10c32eb16e440",
+    "entities": [
+      {
+        "tableName": "Letter",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`text` TEXT, `diacritic` INTEGER, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "diacritic",
+            "columnName": "diacritic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Sound",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`valueIpa` TEXT, `diacritic` INTEGER, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "valueIpa",
+            "columnName": "valueIpa",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "diacritic",
+            "columnName": "diacritic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LetterSound",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LetterSound_Letter",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LetterSound_id` INTEGER NOT NULL, `letters_id` INTEGER NOT NULL, PRIMARY KEY(`LetterSound_id`, `letters_id`))",
+        "fields": [
+          {
+            "fieldPath": "LetterSound_id",
+            "columnName": "LetterSound_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "letters_id",
+            "columnName": "letters_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "LetterSound_id",
+            "letters_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LetterSound_Sound",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LetterSound_id` INTEGER NOT NULL, `sounds_id` INTEGER NOT NULL, PRIMARY KEY(`LetterSound_id`, `sounds_id`))",
+        "fields": [
+          {
+            "fieldPath": "LetterSound_id",
+            "columnName": "LetterSound_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sounds_id",
+            "columnName": "sounds_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "LetterSound_id",
+            "sounds_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Word",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`text` TEXT NOT NULL, `wordType` TEXT, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wordType",
+            "columnName": "wordType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Number",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` INTEGER NOT NULL, `symbol` TEXT, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Emoji",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`glyph` TEXT NOT NULL, `unicodeVersion` REAL NOT NULL, `unicodeEmojiVersion` REAL NOT NULL, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "glyph",
+            "columnName": "glyph",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unicodeVersion",
+            "columnName": "unicodeVersion",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unicodeEmojiVersion",
+            "columnName": "unicodeEmojiVersion",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Emoji_Word",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`Emoji_id` INTEGER NOT NULL, `words_id` INTEGER NOT NULL, PRIMARY KEY(`Emoji_id`, `words_id`))",
+        "fields": [
+          {
+            "fieldPath": "Emoji_id",
+            "columnName": "Emoji_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "words_id",
+            "columnName": "words_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "Emoji_id",
+            "words_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Image",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `imageFormat` TEXT NOT NULL, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageFormat",
+            "columnName": "imageFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Image_Word",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`Image_id` INTEGER NOT NULL, `words_id` INTEGER NOT NULL, PRIMARY KEY(`Image_id`, `words_id`))",
+        "fields": [
+          {
+            "fieldPath": "Image_id",
+            "columnName": "Image_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "words_id",
+            "columnName": "words_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "Image_id",
+            "words_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StoryBook",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `description` TEXT, `coverImageId` INTEGER NOT NULL, `readingLevel` TEXT, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "coverImageId",
+            "columnName": "coverImageId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readingLevel",
+            "columnName": "readingLevel",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StoryBookChapter",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`storyBookId` INTEGER NOT NULL, `sortOrder` INTEGER NOT NULL, `imageId` INTEGER NOT NULL, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "storyBookId",
+            "columnName": "storyBookId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortOrder",
+            "columnName": "sortOrder",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageId",
+            "columnName": "imageId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StoryBookParagraph",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`storyBookChapterId` INTEGER NOT NULL, `sortOrder` INTEGER NOT NULL, `originalText` TEXT NOT NULL, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "storyBookChapterId",
+            "columnName": "storyBookChapterId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortOrder",
+            "columnName": "sortOrder",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalText",
+            "columnName": "originalText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StoryBookParagraph_Word",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`StoryBookParagraph_id` INTEGER NOT NULL, `words_id` INTEGER NOT NULL, `words_ORDER` INTEGER NOT NULL, PRIMARY KEY(`StoryBookParagraph_id`, `words_ORDER`))",
+        "fields": [
+          {
+            "fieldPath": "StoryBookParagraph_id",
+            "columnName": "StoryBookParagraph_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "words_id",
+            "columnName": "words_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "words_ORDER",
+            "columnName": "words_ORDER",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "StoryBookParagraph_id",
+            "words_ORDER"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Video",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `videoFormat` TEXT NOT NULL, `revisionNumber` INTEGER NOT NULL, `usageCount` INTEGER, `id` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "videoFormat",
+            "columnName": "videoFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionNumber",
+            "columnName": "revisionNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0f15f0f2b2fa7d5262a10c32eb16e440')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
index 6d6ac698..c60f74d6 100644
--- a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
+++ b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
@@ -46,7 +46,7 @@
 import ai.elimu.content_provider.room.entity.Video;
 import ai.elimu.content_provider.room.entity.Word;
 
-@Database(version = 26, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
+@Database(version = 27, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
 @TypeConverters({Converters.class})
 public abstract class RoomDb extends RoomDatabase {
 
@@ -116,7 +116,8 @@ public static RoomDb getDatabase(final Context context) {
                                     MIGRATION_22_23,
                                     MIGRATION_23_24,
                                     MIGRATION_24_25,
-                                    MIGRATION_25_26
+                                    MIGRATION_25_26,
+                                    MIGRATION_26_27
                             )
                             .build();
                 }
@@ -358,4 +359,15 @@ public void migrate(SupportSQLiteDatabase database) {
             database.execSQL(sql);
         }
     };
+
+    private static final Migration MIGRATION_26_27 = new Migration(26, 27) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            Log.i(getClass().getName(), "migrate (26 --> 27)");
+
+            String sql = "DROP TABLE `Audio`";
+            Log.i(getClass().getName(), "sql: " + sql);
+            database.execSQL(sql);
+        }
+    };
 }