|
@@ -25,7 +25,6 @@ import android.content.Context
|
|
import android.net.Uri
|
|
import android.net.Uri
|
|
import android.os.Build
|
|
import android.os.Build
|
|
import android.util.Log
|
|
import android.util.Log
|
|
-import android.widget.Toast
|
|
|
|
import androidx.core.content.PermissionChecker
|
|
import androidx.core.content.PermissionChecker
|
|
import androidx.work.Data
|
|
import androidx.work.Data
|
|
import androidx.work.OneTimeWorkRequest
|
|
import androidx.work.OneTimeWorkRequest
|
|
@@ -34,7 +33,6 @@ import androidx.work.Worker
|
|
import androidx.work.WorkerParameters
|
|
import androidx.work.WorkerParameters
|
|
import autodagger.AutoInjector
|
|
import autodagger.AutoInjector
|
|
import com.bluelinelabs.conductor.Controller
|
|
import com.bluelinelabs.conductor.Controller
|
|
-import com.nextcloud.talk.R
|
|
|
|
import com.nextcloud.talk.api.NcApi
|
|
import com.nextcloud.talk.api.NcApi
|
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
|
import com.nextcloud.talk.models.database.UserEntity
|
|
import com.nextcloud.talk.models.database.UserEntity
|
|
@@ -103,13 +101,9 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
|
|
uploadFile(currentUser, ncTargetpath, filename, roomToken, requestBody, sourcefileUri)
|
|
uploadFile(currentUser, ncTargetpath, filename, roomToken, requestBody, sourcefileUri)
|
|
}
|
|
}
|
|
} catch (e: IllegalStateException) {
|
|
} catch (e: IllegalStateException) {
|
|
- Toast.makeText(context, context.resources.getString(R.string.nc_common_error_sorry), Toast.LENGTH_LONG)
|
|
|
|
- .show()
|
|
|
|
Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e)
|
|
Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e)
|
|
return Result.failure()
|
|
return Result.failure()
|
|
} catch (e: IllegalArgumentException) {
|
|
} catch (e: IllegalArgumentException) {
|
|
- Toast.makeText(context, context.resources.getString(R.string.nc_common_error_sorry), Toast.LENGTH_LONG)
|
|
|
|
- .show()
|
|
|
|
Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e)
|
|
Log.e(javaClass.simpleName, "Something went wrong when trying to upload file", e)
|
|
return Result.failure()
|
|
return Result.failure()
|
|
}
|
|
}
|
|
@@ -124,8 +118,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
|
|
while (input.read(buf) != -1)
|
|
while (input.read(buf) != -1)
|
|
requestBody = RequestBody.create("application/octet-stream".toMediaTypeOrNull(), buf)
|
|
requestBody = RequestBody.create("application/octet-stream".toMediaTypeOrNull(), buf)
|
|
} catch (e: Exception) {
|
|
} catch (e: Exception) {
|
|
- Toast.makeText(context, context.resources.getString(R.string.nc_common_error_sorry), Toast.LENGTH_LONG)
|
|
|
|
- .show()
|
|
|
|
Log.e(javaClass.simpleName, "failed to create RequestBody for $sourcefileUri", e)
|
|
Log.e(javaClass.simpleName, "failed to create RequestBody for $sourcefileUri", e)
|
|
}
|
|
}
|
|
return requestBody
|
|
return requestBody
|
|
@@ -154,8 +146,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
|
|
}
|
|
}
|
|
|
|
|
|
override fun onError(e: Throwable) {
|
|
override fun onError(e: Throwable) {
|
|
- Toast.makeText(context, context.resources.getString(R.string.nc_common_error_sorry), Toast.LENGTH_LONG)
|
|
|
|
- .show()
|
|
|
|
Log.e(TAG, "failed to upload file $filename")
|
|
Log.e(TAG, "failed to upload file $filename")
|
|
}
|
|
}
|
|
|
|
|