Basic file upload implemented

added notification channel and support

file upload events finalised, and code optimised

Ktlintformat applied

App crash fixed due to DI

Author: danishjamal104

app/build.gradle

@@ -54,6 +54,8 @@ dependencies {
     implementation "androidx.room:room-runtime:$versions.room"
     kapt "androidx.room:room-compiler:$versions.room"
 
+    implementation "androidx.work:work-runtime-ktx:$versions.work"
+
     // optional - Kotlin Extensions and Coroutines support for Room
     implementation "androidx.room:room-ktx:$versions.room"
 
@@ -65,6 +67,9 @@ dependencies {
     implementation "com.google.dagger:hilt-android:$versions.hilt"
     kapt "com.google.dagger:hilt-compiler:$versions.hilt"
 
+    //implementation 'androidx.hilt:hilt-work:1.0.0'
+    //kapt 'androidx.hilt:hilt-compiler:1.0.0'
+
     // Amplify core dependency
     implementation "com.amplifyframework:core-kotlin:$versions.amplify_core_kotlin"
     implementation "com.amplifyframework:aws-auth-cognito:$versions.amplify_core"
@@ -88,4 +93,9 @@ dependencies {
     implementation "com.facebook.shimmer:shimmer:$versions.shimmer"
 
     implementation "com.github.takusemba:spotlight:$versions.spotlight"
+
+    implementation 'com.github.dhaval2404:imagepicker:1.8'
+
+    implementation 'com.github.florent37:inline-activity-result-kotlin:1.0.4'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
 }

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         android:theme="@style/Theme.VTransfer">
         <meta-data android:name="CLOUDINARY_URL" android:value="cloudinary://@code-gambit"/>
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.activity.main.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/github/code/gambit/data/entity/chache/FileCacheEntity.kt

@@ -14,6 +14,9 @@ class FileCacheEntity(
     @ColumnInfo(name = "name")
     var name: String,
 
+    @ColumnInfo(name = "hash")
+    var hash: String,
+
     @ColumnInfo(name = "type")
     var type: String,
 

app/src/main/java/com/github/code/gambit/data/entity/network/FileNetworkEntity.kt

@@ -6,12 +6,17 @@ import com.google.gson.annotations.SerializedName
 class FileNetworkEntity(
 
     @SerializedName("PK")
+    @Expose
     var pk: String,
 
     @SerializedName("SK")
     @Expose
     var sk: String,
 
+    @SerializedName("hash")
+    @Expose
+    var hash: String,
+
     @SerializedName("LS1_SK")
     @Expose
     var ls1_sk: String,
@@ -20,8 +25,19 @@ class FileNetworkEntity(
     @Expose
     var size: Int,
 
-    @SerializedName("type")
+    @SerializedName("f_type")
     @Expose
     var type: String
 
-)
+) {
+    companion object {
+        fun fromString(str: String): FileNetworkEntity {
+            val arr = str.split('\n')
+            return FileNetworkEntity(arr[0], arr[1], arr[2], arr[3], arr[4].toInt(), arr[5])
+        }
+    }
+
+    override fun toString(): String {
+        return "$pk\n$sk\n$hash\n$ls1_sk\n$size\n$type"
+    }
+}

app/src/main/java/com/github/code/gambit/data/mapper/cache/FileCacheMapper.kt

@@ -13,6 +13,7 @@ constructor() : EntityMapper<FileCacheEntity, File> {
         return File(
             id = entity.id,
             name = entity.name,
+            hash = entity.hash,
             type = entity.type,
             timestamp = entity.timestamp,
             size = entity.size,
@@ -24,6 +25,7 @@ constructor() : EntityMapper<FileCacheEntity, File> {
         return FileCacheEntity(
             id = domainModel.id,
             name = domainModel.name,
+            hash = domainModel.hash,
             type = domainModel.type,
             timestamp = domainModel.timestamp,
             size = domainModel.size,

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

@@ -15,6 +15,7 @@ constructor() : EntityMapper<FileNetworkEntity, File> {
         return File(
             id = "${entity.pk}__${entity.sk}".toBase64(),
             name = entity.ls1_sk,
+            hash = entity.hash,
             type = entity.type,
             timestamp = entity.sk.split("#")[1],
             size = "${entity.size} Mb",
@@ -26,6 +27,7 @@ constructor() : EntityMapper<FileNetworkEntity, File> {
         return FileNetworkEntity(
             pk = domainModel.id.fromBase64().split("__")[0],
             sk = "FILE#${domainModel.timestamp}",
+            hash = domainModel.hash,
             ls1_sk = domainModel.name,
             size = domainModel.size.split(" ")[0].toInt(),
             type = domainModel.type

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

@@ -3,6 +3,7 @@ package com.github.code.gambit.data.model
 data class File(
     var id: String,
     var name: String,
+    var hash: String,
     var type: String,
     var timestamp: String,
     var size: String,

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

@@ -30,8 +30,8 @@ object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideRetroFitBuilder(gson: Gson): Retrofit.Builder {
-        return Retrofit.Builder().baseUrl("https://open-api.xyz/placeholder/")
+    fun provideRetroFitBuilder(gson: Gson, @Named(AppConstant.Named.BASE_URL) baseUrl: String): Retrofit.Builder {
+        return Retrofit.Builder().baseUrl(baseUrl)
             .addConverterFactory(GsonConverterFactory.create(gson))
     }
 
@@ -41,13 +41,6 @@ object NetworkModule {
         return retrofitBuilder.build().create(ApiService::class.java)
     }
 
-    @Singleton
-    @Named(AppConstant.Named.USER_ID)
-    @Provides
-    fun provideUserId(preferenceManager: PreferenceManager): String {
-        return preferenceManager.getUserId()!!
-    }
-
     @Singleton
     @Provides
     fun provideFileService(apiService: ApiService): FileService {
@@ -62,7 +55,15 @@ object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideUserService(apiService: ApiService, @Named("UID") userId: String): UserService {
+    fun provideUserService(apiService: ApiService, preferenceManager: PreferenceManager): UserService {
+        val userId = preferenceManager.getUserId()!!
         return UserServiceImpl(apiService, userId)
     }
+
+    @Singleton
+    @Named(AppConstant.Named.BASE_URL)
+    @Provides
+    fun providesBaseUrl(): String {
+        return "https://mhv71te0rh.execute-api.ap-south-1.amazonaws.com/beta/"
+    }
 }

app/src/main/java/com/github/code/gambit/helper/file/FileUploadState.kt

@@ -0,0 +1,8 @@
+package com.github.code.gambit.helper.file
+
+import com.github.code.gambit.data.entity.network.FileNetworkEntity
+
+sealed class FileUploadState {
+    data class UploadStarted(val fileName: String) : FileUploadState()
+    data class UploadSuccess(val file: FileNetworkEntity) : FileUploadState()
+}

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

@@ -0,0 +1,118 @@
+package com.github.code.gambit.network
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+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.network.FileNetworkEntity
+import com.github.code.gambit.network.api.ApiService
+import com.github.code.gambit.network.api.file.FileService
+import com.github.code.gambit.network.api.file.FileServiceImpl
+import com.github.code.gambit.ui.activity.main.MainActivity
+import com.github.code.gambit.utility.AppConstant
+import com.google.gson.GsonBuilder
+import io.ipfs.kotlin.defaults.InfuraIPFS
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import timber.log.Timber
+import java.io.File
+
+class FileUploadWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx, params) {
+
+    /**
+     * @inputData filePath: String is the absolute file path
+     * @inputData fileName: String name of the file
+     * @inputData userId: String Id of the user used for api call
+     * @inputData fileSize: Int size of the file in Mb
+     *
+     * @outputData data: Data toString of FileNetworkEntitiy
+     */
+    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 userId: String = inputData.getString(AppConstant.Worker.USER_ID)!!
+        val fileSize: Int = inputData.getInt(AppConstant.Worker.FILE_SIZE_KEY, -1)
+        makeStatusNotification(1, "New file", "Uploading file $fileName of size $fileSize mb", true)
+        val file = File(filePath)
+        val res = InfuraIPFS().add.file(file, fileName, fileName).Hash
+        // val res = "test-hash-to-avoid-unnecessary-server-call"
+        Timber.tag("out").i(res)
+        val fileService = getFileService()
+        val task = fileService.uploadFile(userId, FileNetworkEntity("", "", res, fileName, fileSize, fileName.split(".")[1]))
+        val data = workDataOf(AppConstant.Worker.FILE_OUTPUT_KEY to task.toString())
+        makeStatusNotification(1, "File Uploaded", task.toString(), false)
+        return Result.success(data)
+    }
+
+    private fun getApiService(): ApiService {
+        return Retrofit.Builder().baseUrl(AppConstant.BASE_URL)
+            .addConverterFactory(
+                GsonConverterFactory
+                    .create(
+                        GsonBuilder()
+                            .excludeFieldsWithoutExposeAnnotation().create()
+                    )
+            ).build().create(ApiService::class.java)
+    }
+
+    private fun getFileService(): FileService {
+        return FileServiceImpl(getApiService())
+    }
+
+    /**
+     * @param id Notification id
+     * @param title notification title
+     * @param message Notification message
+     * @param progress determines whether  to show progress or not
+     */
+    private fun makeStatusNotification(id: Int, title: String, message: String, progress: Boolean) {
+        val context = applicationContext
+        // Make a channel if necessary
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // Create the NotificationChannel, but only on API 26+ because
+            // the NotificationChannel class is new and not in the support library
+            val name = AppConstant.Notification.CHANNEL_NAME
+            val description = AppConstant.Notification.CHANNEL_DESCRIPTION
+            val importance = NotificationManager.IMPORTANCE_HIGH
+            val channel = NotificationChannel(AppConstant.Notification.CHANNEL_ID, name, importance)
+            channel.description = description
+
+            // Add the channel
+            val notificationManager =
+                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
+
+            notificationManager?.createNotificationChannel(channel)
+        }
+
+        val intent = Intent(context, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+
+        val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+
+        // Create the notification
+        val builder = NotificationCompat.Builder(context, AppConstant.Notification.CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentTitle(title)
+            .setContentText(message)
+            .setContentIntent(pendingIntent)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+            .setVibrate(LongArray(0))
+
+        if (progress) {
+            builder.setProgress(0, 0, true)
+        }
+
+        // Show the notification
+        NotificationManagerCompat.from(context).notify(id, builder.build())
+    }
+}