file loading implemented, with major fix in uploading feature

file loading implemented, with major fix in uploading feature

Author: danishjamal104

app/build.gradle

@@ -47,7 +47,7 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:allowBackup="true"
         android:fullBackupContent="false"
         tools:replace="android:fullBackupContent"
+        android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"

app/src/main/java/com/github/code/gambit/backgroundtask/FileUploadWorker.kt

@@ -8,11 +8,18 @@ import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.room.Room
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import com.github.code.gambit.R
+import com.github.code.gambit.data.entity.chache.FileCacheEntity
 import com.github.code.gambit.data.entity.network.FileNetworkEntity
+import com.github.code.gambit.data.local.Database
+import com.github.code.gambit.data.local.FileDao
+import com.github.code.gambit.data.mapper.cache.FileCacheMapper
+import com.github.code.gambit.data.mapper.network.FileNetworkMapper
+import com.github.code.gambit.data.model.FileMetaData
 import com.github.code.gambit.data.remote.services.ApiService
 import com.github.code.gambit.data.remote.services.file.FileService
 import com.github.code.gambit.data.remote.services.file.FileServiceImpl
@@ -37,23 +44,39 @@ class FileUploadWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker
      * @outputData data: Data toString of FileNetworkEntity
      */
     override suspend fun doWork(): Result {
-        val filePath: String = inputData.getString(AppConstant.Worker.FILE_URI_KEY)!!
-        val fileName: String = inputData.getString(AppConstant.Worker.FILE_NAME_KEY)!!
-        val fileSize: Int = inputData.getInt(AppConstant.Worker.FILE_SIZE_KEY, -1)
+        val fileMetaDataString = inputData.getString(AppConstant.Worker.FILE_META_DATA)!!
+        val fmd = FileMetaData.fromString(fileMetaDataString)
         val uid = System.currentTimeMillis().toInt()
-        val size = String.format("%.2f", fileSize.div(10.0.pow(6.0)))
-        makeStatusNotification(uid, "New file", "Uploading file $fileName of size $size MB", true)
-        val file = File(filePath)
-        val res = InfuraIPFS().add.file(file, fileName, fileName).Hash
+        val size = String.format("%.2f", fmd.size.div(10.0.pow(6.0)))
+        makeStatusNotification(uid, "New file", "Uploading file ${fmd.name} of size $size MB", true)
+        val file = File(fmd.path)
+        val a = System.currentTimeMillis()
+        val res = InfuraIPFS().add.file(file, fmd.name, fmd.name).Hash
+        val b = System.currentTimeMillis()
         // val res = "test-hash-to-avoid-unnecessary-server-call"
         Timber.tag("out").i(res)
+        Timber.tag("out").i("Took ${b - a} ms")
+        val fileDao = getFileDao()
         val fileService = getFileService()
-        val task = fileService.uploadFile(FileNetworkEntity("", "", res, fileName, fileSize, fileName.split(".")[1]))
+        val task = fileService.uploadFile(FileNetworkEntity("", "", res, fmd.name, fmd.size, fmd.name.split(".")[1]))
+        fileDao.insertFiles(getFileCacheEntityFromFileNetworkEntity(task))
         val data = workDataOf(AppConstant.Worker.FILE_OUTPUT_KEY to task.toString())
         makeStatusNotification(uid, "File Uploaded", task.toString(), false)
         return Result.success(data)
     }
 
+    private fun getFileCacheEntityFromFileNetworkEntity(fileNetworkEntity: FileNetworkEntity): FileCacheEntity {
+        val networkMapper = FileNetworkMapper()
+        val cacheMapper = FileCacheMapper()
+        return cacheMapper.mapToEntity(networkMapper.mapFromEntity(fileNetworkEntity))
+    }
+
+    private fun getFileDao(): FileDao {
+        return Room.databaseBuilder(applicationContext, Database::class.java, AppConstant.Database.DB_NAME)
+            .fallbackToDestructiveMigration()
+            .build().fileDao()
+    }
+
     private fun getApiService(): ApiService {
         return Retrofit.Builder().baseUrl(AppConstant.BASE_URL)
             .addConverterFactory(

app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt

@@ -0,0 +1,9 @@
+package com.github.code.gambit.data.local
+
+import com.github.code.gambit.data.model.File
+
+interface CacheDataSource {
+
+    suspend fun insertFiles(files: List<File>): Long
+    suspend fun getFiles(): List<File>
+}

app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt

@@ -0,0 +1,24 @@
+package com.github.code.gambit.data.local
+
+import com.github.code.gambit.data.mapper.cache.FileCacheMapper
+import com.github.code.gambit.data.model.File
+
+class CacheDataSourceImpl
+constructor(
+    val fileCacheMapper: FileCacheMapper,
+    val fileDao: FileDao
+) : CacheDataSource {
+
+    override suspend fun getFiles(): List<File> {
+        val fileCacheEntities = fileDao.getFiles()
+        return fileCacheMapper.mapFromEntityList(fileCacheEntities)
+    }
+
+    override suspend fun insertFiles(files: List<File>): Long {
+        var c = 0L
+        for (file in files) {
+            c += fileDao.insertFiles(fileCacheMapper.mapToEntity(file))
+        }
+        return c
+    }
+}

app/src/main/java/com/github/code/gambit/data/local/Database.kt

@@ -0,0 +1,11 @@
+package com.github.code.gambit.data.local
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.github.code.gambit.data.entity.chache.FileCacheEntity
+
+@Database(entities = [FileCacheEntity::class], version = 1)
+abstract class Database : RoomDatabase() {
+
+    abstract fun fileDao(): FileDao
+}

app/src/main/java/com/github/code/gambit/data/local/FileDao.kt

@@ -0,0 +1,20 @@
+package com.github.code.gambit.data.local
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.github.code.gambit.data.entity.chache.FileCacheEntity
+
+@Dao
+interface FileDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertFiles(fileCacheEntity: FileCacheEntity): Long
+
+    @Query("SELECT * FROM files ORDER BY timestamp DESC")
+    suspend fun getFiles(): List<FileCacheEntity>
+
+    @Query("SELECT * FROM files WHERE id = :id")
+    suspend fun getFile(id: String): List<FileCacheEntity>
+}

app/src/main/java/com/github/code/gambit/data/mapper/network/FileNetworkMapper.kt

@@ -3,6 +3,7 @@ package com.github.code.gambit.data.mapper.network
 import com.github.code.gambit.data.EntityMapper
 import com.github.code.gambit.data.entity.network.FileNetworkEntity
 import com.github.code.gambit.data.model.File
+import com.github.code.gambit.utility.extention.byteToMb
 import com.github.code.gambit.utility.extention.fromBase64
 import com.github.code.gambit.utility.extention.toBase64
 import javax.inject.Inject
@@ -18,8 +19,8 @@ constructor() : EntityMapper<FileNetworkEntity, File> {
             hash = entity.hash,
             type = entity.type,
             timestamp = entity.sk.split("#")[1],
-            size = "${entity.size} Mb",
-            extension = entity.ls1_sk.split(".")[1]
+            size = entity.size.byteToMb(),
+            extension = ".${entity.type}"
         )
     }
 

app/src/main/java/com/github/code/gambit/data/model/FileMetaData.kt

@@ -0,0 +1,20 @@
+package com.github.code.gambit.data.model
+
+import java.lang.IndexOutOfBoundsException
+
+class FileMetaData(val path: String, val name: String, val size: Int) {
+
+    companion object {
+        fun fromString(string: String): FileMetaData {
+            val arr = string.split("\n")
+            if (arr.size < 3) {
+                throw throw IndexOutOfBoundsException("Invalid string")
+            }
+            return FileMetaData(arr[0], arr[1], arr[2].toInt())
+        }
+    }
+
+    override fun toString(): String {
+        return "$path\n$name\n$size"
+    }
+}

app/src/main/java/com/github/code/gambit/di/CacheModule.kt

@@ -0,0 +1,44 @@
+package com.github.code.gambit.di
+
+import android.content.Context
+import androidx.room.Room
+import com.github.code.gambit.data.local.CacheDataSource
+import com.github.code.gambit.data.local.CacheDataSourceImpl
+import com.github.code.gambit.data.local.Database
+import com.github.code.gambit.data.local.FileDao
+import com.github.code.gambit.data.mapper.cache.FileCacheMapper
+import com.github.code.gambit.utility.AppConstant
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CacheModule {
+
+    @Singleton
+    @Provides
+    fun provideDatabase(@ApplicationContext context: Context): Database {
+        return Room.databaseBuilder(context, Database::class.java, AppConstant.Database.DB_NAME)
+            .fallbackToDestructiveMigration()
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideFileDao(database: Database): FileDao {
+        return database.fileDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideCacheDataSource(
+        fileCacheMapper: FileCacheMapper,
+        fileDao: FileDao
+    ): CacheDataSource {
+        return CacheDataSourceImpl(fileCacheMapper, fileDao)
+    }
+}