Skip to content

Commit 89b37b7

Browse files
daviveldavivel
committed
Merge branch 'develop' into refactor_remote_operation_to_create_folder
2 parents 0421d53 + 9fe7d5b commit 89b37b7

92 files changed

Lines changed: 337 additions & 217 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<uses-sdk
4040
android:minSdkVersion="8"
41-
android:targetSdkVersion="13" />
41+
android:targetSdkVersion="19" />
4242

4343
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
4444
</uses-permission>
@@ -112,7 +112,8 @@
112112
</service>
113113
<service
114114
android:name=".syncadapter.FileSyncService"
115-
android:exported="true" >
115+
android:exported="true"
116+
android:process=":sync">
116117
<intent-filter>
117118
<action android:name="android.content.SyncAdapter" />
118119
</intent-filter>

‎oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import android.util.Log;
4343

4444

45+
4546
/**
4647
* AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with
4748
* a custom SSLContext and an optional Hostname Verifier.

‎oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import android.util.Log;
3535

3636

37+
3738
/**
3839
* @author David A. Velasco
3940
*/

‎oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import android.util.Log;
3232

3333

34+
3435
/**
3536
* Bearer authentication scheme as defined in RFC 6750.
3637
*

‎oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import android.util.Log;
3535

3636

37-
3837
/**
3938
* A RequestEntity that represents a PIECE of a file.
4039
*

‎oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
3737

3838

39-
40-
4139
/**
4240
* A RequestEntity that represents a File.
4341
*

‎oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.owncloud.android.oc_framework.network.BearerAuthScheme;
4545
import com.owncloud.android.oc_framework.network.BearerCredentials;
4646

47-
4847
import android.net.Uri;
4948
import android.util.Log;
5049

‎oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.jackrabbit.webdav.property.DavPropertySet;
2525

2626

27+
2728
import android.net.Uri;
2829
import android.util.Log;
2930

‎oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
2727

2828

29+
2930
import android.accounts.Account;
3031
import android.accounts.AccountManager;
3132
import android.accounts.AccountsException;

‎project.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
# project structure.
99

1010
# Project target.
11-
target=android-17
12-
android.library.reference.1=actionbarsherlock\\library
11+
target=android-19
12+
android.library.reference.1=actionbarsherlock/library
1313
android.library.reference.2=oc_framework

0 commit comments

Comments
 (0)