flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-17 11:22:54 +00:00
Code Issues Releases Wiki Activity

Add user-agent string to setup options

Browse Source
This commit is contained in:
masensio
2015-03-18 17:08:19 +01:00
parent fc07af2364
commit 87582c4a8e
6 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+9 -6
View File
@@ -107,16 +107,18 @@ public abstract class RemoteOperation implements Runnable {
*/
public RemoteOperationResult execute(Account account, Context context, String userAgent) {
if (account == null)
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Account");
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
"Account");
if (context == null)
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Context");
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
"Context");
mAccount = account;
mContext = context.getApplicationContext();
mUserAgent = userAgent;
try {
OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
getClientFor(ocAccount, mContext);
getClientFor(ocAccount, mContext, mUserAgent);
} catch (Exception e) {
Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
return new RemoteOperationResult(e);
@@ -137,7 +139,8 @@ public abstract class RemoteOperation implements Runnable {
*/
public RemoteOperationResult execute(OwnCloudClient client, String userAgent) {
if (client == null)
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
"OwnCloudClient");
mClient = client;
mUserAgent = userAgent;
return run(client);
@@ -284,12 +287,12 @@ public abstract class RemoteOperation implements Runnable {
/** DEPRECATED BLOCK - will be removed at version 1.0 */
if (mCallerActivity != null) {
mClient = OwnCloudClientFactory.createOwnCloudClient(
mAccount, mContext, mCallerActivity);
mAccount, mContext, mCallerActivity, mUserAgent);
} else {
/** EOF DEPRECATED */
OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
getClientFor(ocAccount, mContext);
getClientFor(ocAccount, mContext, mUserAgent);
}
} else {