Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aa2c307 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Perform database moveObject after actual move."

parents bd20c630 ee8946f4

media/mtp/MtpServer.cpp

+2 −8
Original line number Diff line number Diff line
@@ -1062,10 +1062,6 @@ MtpResponseCode MtpServer::doMoveObject() { 
        path += "/";

    path += info.mName;



    result = mDatabase->moveObject(objectHandle, parent, storageID, path);

    if (result != MTP_RESPONSE_OK)

        return result;



    if (info.mStorageID == storageID) {

        ALOGV("Moving file from %s to %s", (const char*)fromPath, (const char*)path);

        if (rename(fromPath, path)) {
@@ -1092,10 +1088,8 @@ MtpResponseCode MtpServer::doMoveObject() { 
    }



    // If the move failed, undo the database change

    if (result != MTP_RESPONSE_OK)

        if (mDatabase->moveObject(objectHandle, info.mParent, info.mStorageID,

                    fromPath) != MTP_RESPONSE_OK)

            ALOGE("Couldn't undo failed move");

    if (result == MTP_RESPONSE_OK)

        result = mDatabase->moveObject(objectHandle, parent, storageID, path);



    return result;

}