mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
David A. Velasco 2014-06-02 15:13:09 +02:00
commit 0a1447e866
3 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -18,8 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
android:versionCode="105006"
android:versionName="1.5.6" xmlns:android="http://schemas.android.com/apk/res/android">
android:versionCode="105007"
android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />

4
oc_jb_workaround/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.owncloud.android.workaround.accounts"
android:versionCode="0100015"
android:versionName="1.0.15" >
android:versionCode="0100016"
android:versionName="1.0.16" >
<uses-sdk
android:minSdkVersion="16"

67
src/com/owncloud/android/operations/SynchronizeFileOperation.java
View file

@ -53,21 +53,20 @@ public class SynchronizeFileOperation extends SyncOperation {
private Context mContext;
private boolean mTransferWasRequested = false;
public SynchronizeFileOperation(
OCFile localFile,
OCFile serverFile, // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation
Account account,
boolean syncFileContents,
Context context) {
mLocalFile = localFile;
mServerFile = serverFile;
mAccount = account;
mSyncFileContents = syncFileContents;
mContext = context;
}
/**
* Constructor.
*
* Uses remotePath to retrieve all the data in local cache and remote server when the operation
* is executed, instead of reusing {@link OCFile} instances.
*
* @param
* @param account ownCloud account holding the file.
* @param syncFileContents When 'true', transference of data will be started by the
* operation if needed and no conflict is detected.
* @param context Android context; needed to start transfers.
*/
public SynchronizeFileOperation(
String remotePath,
Account account,
@ -75,20 +74,53 @@ public class SynchronizeFileOperation extends SyncOperation {
Context context) {
mRemotePath = remotePath;
mLocalFile = null;
mServerFile = null;
mAccount = account;
mSyncFileContents = syncFileContents;
mContext = context;
}
/**
* Constructor allowing to reuse {@link OCFile} instances just queried from cache or network.
*
* Useful for folder / account synchronizations.
*
* @param localFile Data of file currently hold in device cache. MUSTN't be null.
* @param serverFile Data of file just retrieved from network. If null, will be
* retrieved from network by the operation when executed.
* @param account ownCloud account holding the file.
* @param syncFileContents When 'true', transference of data will be started by the
* operation if needed and no conflict is detected.
* @param context Android context; needed to start transfers.
*/
public SynchronizeFileOperation(
OCFile localFile,
OCFile serverFile,
Account account,
boolean syncFileContents,
Context context) {
mLocalFile = localFile;
mServerFile = serverFile;
mRemotePath = localFile.getRemotePath();
mAccount = account;
mSyncFileContents = syncFileContents;
mContext = context;
}
@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null;
mTransferWasRequested = false;
// Get local file from the DB
mLocalFile = getStorageManager().getFileByPath(mRemotePath);
if (mLocalFile == null) {
// Get local file from the DB
mLocalFile = getStorageManager().getFileByPath(mRemotePath);
}
if (!mLocalFile.isDown()) {
/// easy decision
@ -99,8 +131,7 @@ public class SynchronizeFileOperation extends SyncOperation {
/// local copy in the device -> need to think a bit more before do anything
if (mServerFile == null) {
String remotePath = mLocalFile.getRemotePath();
ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
ReadRemoteFileOperation operation = new ReadRemoteFileOperation(mRemotePath);
result = operation.execute(client);
if (result.isSuccess()){
mServerFile = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));