|
@@ -153,6 +153,8 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
|
|
if (existingFile == null) {
|
|
if (existingFile == null) {
|
|
// fetch info of existing file from server
|
|
// fetch info of existing file from server
|
|
val operation = ReadFileRemoteOperation(newFile!!.remotePath)
|
|
val operation = ReadFileRemoteOperation(newFile!!.remotePath)
|
|
|
|
+
|
|
|
|
+ @Suppress("TooGenericExceptionCaught")
|
|
Thread {
|
|
Thread {
|
|
try {
|
|
try {
|
|
val result = operation.execute(account, this)
|
|
val result = operation.execute(account, this)
|