Refactor

codec2talkie/src/main/AndroidManifest.xml

@@ -42,7 +42,7 @@
             android:name=".recorder.RecorderActivity"
             android:configChanges="orientation|screenSize" />
         <activity
-            android:name=".log.LogItemActivity"
+            android:name=".storage.log.LogItemActivity"
             android:configChanges="orientation|screenSize" />
         <activity
             android:name=".MainActivity"

codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java

@@ -53,7 +53,7 @@ import com.radio.codec2talkie.connect.BleConnectActivity;
 import com.radio.codec2talkie.connect.BluetoothConnectActivity;
 import com.radio.codec2talkie.connect.BluetoothSocketHandler;
 import com.radio.codec2talkie.connect.TcpIpConnectActivity;
-import com.radio.codec2talkie.log.LogItemActivity;
+import com.radio.codec2talkie.storage.log.LogItemActivity;
 import com.radio.codec2talkie.protocol.ProtocolFactory;
 import com.radio.codec2talkie.recorder.RecorderActivity;
 import com.radio.codec2talkie.settings.PreferenceKeys;

codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java

@@ -20,8 +20,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import com.radio.codec2talkie.R;
-import com.radio.codec2talkie.log.LogItem;
-import com.radio.codec2talkie.log.LogItemRepository;
+import com.radio.codec2talkie.storage.log.LogItem;
+import com.radio.codec2talkie.storage.log.LogItemRepository;
 import com.radio.codec2talkie.protocol.ProtocolCallback;
 import com.radio.codec2talkie.protocol.Protocol;
 import com.radio.codec2talkie.protocol.ProtocolFactory;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/AppDatabase.java

@@ -1,29 +1,31 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage;
 
 import android.content.Context;
 
-import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
 
+import com.radio.codec2talkie.storage.log.LogItem;
+import com.radio.codec2talkie.storage.log.LogItemDao;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Database(entities = {LogItem.class}, version = 1, exportSchema = false)
-public abstract class LogItemDatabase extends RoomDatabase {
+@androidx.room.Database(entities = {LogItem.class}, version = 1, exportSchema = false)
+public abstract class AppDatabase extends RoomDatabase {
 
     private static final int NUMBER_OF_THREADS = 4;
 
     public static final ExecutorService databaseWriteExecutor = Executors.newFixedThreadPool(NUMBER_OF_THREADS);
     public abstract LogItemDao logItemDao();
 
-    private static LogItemDatabase _db;
+    private static AppDatabase _db;
 
-    public static LogItemDatabase getDatabase(Context context) {
+    public static AppDatabase getDatabase(Context context) {
         if (_db == null) {
-            synchronized (LogItemDatabase.class) {
+            synchronized (AppDatabase.class) {
                 _db = Room.databaseBuilder(context.getApplicationContext(),
-                        LogItemDatabase.class, LogItemDatabase.class.getName())
+                        AppDatabase.class, AppDatabase.class.getName())
                         .build();
             }
         }

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItem.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemActivity.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import android.os.Bundle;
 import android.view.Menu;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemAdapter.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import android.view.ViewGroup;
 

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemDao.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemHolder.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import android.view.LayoutInflater;
 import android.view.View;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemRepository.java

@@ -1,9 +1,11 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import android.app.Application;
 
 import androidx.lifecycle.LiveData;
 
+import com.radio.codec2talkie.storage.AppDatabase;
+
 import java.util.List;
 
 public class LogItemRepository {
@@ -12,8 +14,8 @@ public class LogItemRepository {
     private final LiveData<List<LogItem>> _logItemLiveData;
 
     public LogItemRepository(Application application) {
-        LogItemDatabase logItemDatabase = LogItemDatabase.getDatabase(application);
-        _logItemDao = logItemDatabase.logItemDao();
+        AppDatabase appDatabase = AppDatabase.getDatabase(application);
+        _logItemDao = appDatabase.logItemDao();
         _logItemLiveData = _logItemDao.getAllLogItems();
     }
 
@@ -22,12 +24,12 @@ public class LogItemRepository {
     }
 
     public void insertLogItem(LogItem logItem) {
-        LogItemDatabase.databaseWriteExecutor.execute(() -> {
+        AppDatabase.databaseWriteExecutor.execute(() -> {
             _logItemDao.insertLogItem(logItem);
         });
     }
 
     public void deleteAllLogItems() {
-        LogItemDatabase.databaseWriteExecutor.execute(_logItemDao::deleteAllLogItems);
+        AppDatabase.databaseWriteExecutor.execute(_logItemDao::deleteAllLogItems);
     }
 }

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemViewModel.java

@@ -1,4 +1,4 @@
-package com.radio.codec2talkie.log;
+package com.radio.codec2talkie.storage.log;
 
 import android.app.Application;
 

codec2talkie/src/main/res/layout/activity_log_view.xml

@@ -5,7 +5,7 @@
     android:id="@+id/activity_log_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".log.LogItemActivity">
+    tools:context=".storage.log.LogItemActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/log_item_recyclerview"