From: masensio Date: Wed, 18 Mar 2015 16:08:42 +0000 (+0100) Subject: Add user-agent string to setup options X-Git-Tag: oc-android-1.7.1_signed^2~8^2~8 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7a42dc2bf4e98ba9a121958f5442ae197ce65611 Add user-agent string to setup options --- diff --git a/owncloud-android-library b/owncloud-android-library index fc07af23..87582c4a 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit fc07af23643b3c6a1b7df7c4c81b57482111d4a1 +Subproject commit 87582c4a8ea293d582ee7d245bd5df8dc6c2e7c2 diff --git a/res/values/setup.xml b/res/values/setup.xml index 6c1a67a9..fdcd63cb 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -9,6 +9,7 @@ owncloud Owncloud_ ownCloud + Android-ownCloud diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index 67a15987..b1ea3c07 100644 --- a/src/com/owncloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -118,8 +118,7 @@ public class MainApp extends Application { } // user agent - // TODO: decide if it use account_type or another string for user_agent public static String getUserAgent() { - return getAppContext().getResources().getString(R.string.account_type); + return getAppContext().getResources().getString(R.string.user_agent); } } diff --git a/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java b/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java index de07652b..d36a1fad 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java +++ b/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java @@ -61,7 +61,8 @@ public class AuthenticatorAsyncTask extends AsyncTask(imageView); if (storageManager == null) @@ -168,9 +169,11 @@ public class ThumbnailsCacheManager { AccountManager accountMgr = AccountManager.get(MainApp.getAppContext()); mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION); - OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext()); + OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, + MainApp.getAppContext()); mClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, MainApp.getAppContext()); + getClientFor(ocAccount, MainApp.getAppContext(), + MainApp.getUserAgent()); } mFile = params[0]; @@ -276,18 +279,21 @@ public class ThumbnailsCacheManager { // Download thumbnail from server if (mClient != null && mServerVersion != null) { OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion); - if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) { + if (serverOCVersion.compareTo( + new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) { try { int status = -1; - String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + + String uri = mClient.getBaseUri() + "" + + "/index.php/apps/files/api/v1/thumbnail/" + px + "/" + px + Uri.encode(file.getRemotePath(), "/"); Log_OC.d("Thumbnail", "URI: " + uri); GetMethod get = new GetMethod(uri); status = mClient.executeMethod(get); if (status == HttpStatus.SC_OK) { byte[] bytes = get.getResponseBody(); - Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); + Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, + bytes.length); thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); // Add thumbnail to cache diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 9bf7f302..9d81fc40 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -466,7 +466,7 @@ public class FileDownloader extends Service // of update OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this); mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, this); + getClientFor(ocAccount, this, MainApp.getUserAgent()); /// perform the download diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 83d8ffd5..28b663bc 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -574,7 +574,7 @@ public class FileUploader extends Service new FileDataStorageManager(mLastAccount, getContentResolver()); OwnCloudAccount ocAccount = new OwnCloudAccount(mLastAccount, this); mUploadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, this); + getClientFor(ocAccount, this, MainApp.getUserAgent()); } /// check the existence of the parent folder for the file to upload diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index 01b648a4..ee01c418 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -98,11 +98,13 @@ public class OperationsService extends Service { public static final String ACTION_REMOVE = "REMOVE"; public static final String ACTION_CREATE_FOLDER = "CREATE_FOLDER"; public static final String ACTION_SYNC_FILE = "SYNC_FILE"; - public static final String ACTION_SYNC_FOLDER = "SYNC_FOLDER"; // for the moment, just to download + public static final String ACTION_SYNC_FOLDER = "SYNC_FOLDER";//for the moment, just to download public static final String ACTION_MOVE_FILE = "MOVE_FILE"; - public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + ".OPERATION_ADDED"; - public static final String ACTION_OPERATION_FINISHED = OperationsService.class.getName() + ".OPERATION_FINISHED"; + public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + + ".OPERATION_ADDED"; + public static final String ACTION_OPERATION_FINISHED = OperationsService.class.getName() + + ".OPERATION_FINISHED"; private ConcurrentMap> @@ -135,7 +137,8 @@ public class OperationsService extends Service { Log_OC.d(TAG, "Creating service"); /// First worker thread for most of operations - HandlerThread thread = new HandlerThread("Operations thread", Process.THREAD_PRIORITY_BACKGROUND); + HandlerThread thread = new HandlerThread("Operations thread", + Process.THREAD_PRIORITY_BACKGROUND); thread.start(); mOperationsHandler = new ServiceHandler(thread.getLooper(), this); mOperationsBinder = new OperationsServiceBinder(mOperationsHandler); @@ -172,7 +175,8 @@ public class OperationsService extends Service { Pair itemToQueue = newOperation(intent); if (itemToQueue != null) { - mSyncFolderHandler.add(account, remotePath, (SynchronizeFolderOperation)itemToQueue.second); + mSyncFolderHandler.add(account, remotePath, + (SynchronizeFolderOperation)itemToQueue.second); Message msg = mSyncFolderHandler.obtainMessage(); msg.arg1 = startId; msg.obj = itemSyncKey; @@ -249,7 +253,8 @@ public class OperationsService extends Service { public class OperationsServiceBinder extends Binder /* implements OnRemoteOperationListener */ { /** - * Map of listeners that will be reported about the end of operations from a {@link OperationsServiceBinder} instance + * Map of listeners that will be reported about the end of operations from a + * {@link OperationsServiceBinder} instance */ private ConcurrentMap mBoundListeners = new ConcurrentHashMap(); @@ -282,9 +287,11 @@ public class OperationsService extends Service { * Adds a listener interested in being reported about the end of operations. * * @param listener Object to notify about the end of operations. - * @param callbackHandler {@link Handler} to access the listener without breaking Android threading protection. + * @param callbackHandler {@link Handler} to access the listener without + * breaking Android threading protection. */ - public void addOperationListener (OnRemoteOperationListener listener, Handler callbackHandler) { + public void addOperationListener (OnRemoteOperationListener listener, + Handler callbackHandler) { synchronized (mBoundListeners) { mBoundListeners.put(listener, callbackHandler); } @@ -292,7 +299,8 @@ public class OperationsService extends Service { /** - * Removes a listener from the list of objects interested in the being reported about the end of operations. + * Removes a listener from the list of objects interested in the being reported about + * the end of operations. * * @param listener Object to notify about progress of transfer. */ @@ -306,7 +314,8 @@ public class OperationsService extends Service { /** * TODO - IMPORTANT: update implementation when more operations are moved into the service * - * @return 'True' when an operation that enforces the user to wait for completion is in process. + * @return 'True' when an operation that enforces the user to wait for completion is + * in process. */ public boolean isPerformingBlockingOperation() { return (!mServiceHandler.mPendingOperations.isEmpty()); @@ -334,7 +343,8 @@ public class OperationsService extends Service { } - public boolean dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) { + public boolean dispatchResultIfFinished(int operationId, + OnRemoteOperationListener listener) { Pair undispatched = mUndispatchedFinishedOperations.remove(operationId); if (undispatched != null) { @@ -353,15 +363,15 @@ public class OperationsService extends Service { /** - * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting - * to download. + * Returns True when the file described by 'file' in the ownCloud account 'account' is + * downloading or waiting to download. * - * If 'file' is a directory, returns 'true' if some of its descendant files is downloading or waiting - * to download. + * If 'file' is a directory, returns 'true' if some of its descendant files is downloading + * or waiting to download. * * @param account ownCloud account where the remote file is stored. - * @param remotePath Path of the folder to check if something is synchronizing / downloading / uploading - * inside. + * @param remotePath Path of the folder to check if something is synchronizing + * / downloading / uploading inside. */ public boolean isSynchronizing(Account account, String remotePath) { return mSyncFolderHandler.isSynchronizing(account, remotePath); @@ -376,7 +386,8 @@ public class OperationsService extends Service { * Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}. */ private static class ServiceHandler extends Handler { - // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak + // don't make it a final class, and don't remove the static ; lint will warn about a p + // ossible memory leak OperationsService mService; @@ -427,9 +438,10 @@ public class OperationsService extends Service { if (mLastTarget == null || !mLastTarget.equals(next.first)) { mLastTarget = next.first; if (mLastTarget.mAccount != null) { - OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, mService); + OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, + mService); mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService); + getClientFor(ocAccount, mService, MainApp.getUserAgent()); mStorageManager = new FileDataStorageManager( mLastTarget.mAccount, mService.getContentResolver() @@ -439,38 +451,44 @@ public class OperationsService extends Service { if (mLastTarget.mCookie != null && mLastTarget.mCookie.length() > 0) { // just used for GetUserName - // TODO refactor to run GetUserName as AsyncTask in the context of AuthenticatorActivity + // TODO refactor to run GetUserName as AsyncTask in the context of + // AuthenticatorActivity credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials( mLastTarget.mCookie); // SAML SSO } OwnCloudAccount ocAccount = new OwnCloudAccount( mLastTarget.mServerUrl, credentials); mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService); + getClientFor(ocAccount, mService, MainApp.getUserAgent()); mStorageManager = null; } } /// perform the operation if (mCurrentOperation instanceof SyncOperation) { - result = ((SyncOperation)mCurrentOperation).execute(mOwnCloudClient, mStorageManager); + result = ((SyncOperation)mCurrentOperation).execute(mOwnCloudClient, + mStorageManager); } else { result = mCurrentOperation.execute(mOwnCloudClient, MainApp.getUserAgent()); } } catch (AccountsException e) { if (mLastTarget.mAccount == null) { - Log_OC.e(TAG, "Error while trying to get authorization for a NULL account", e); + Log_OC.e(TAG, "Error while trying to get authorization for a NULL account", + e); } else { - Log_OC.e(TAG, "Error while trying to get authorization for " + mLastTarget.mAccount.name, e); + Log_OC.e(TAG, "Error while trying to get authorization for " + + mLastTarget.mAccount.name, e); } result = new RemoteOperationResult(e); } catch (IOException e) { if (mLastTarget.mAccount == null) { - Log_OC.e(TAG, "Error while trying to get authorization for a NULL account", e); + Log_OC.e(TAG, "Error while trying to get authorization for a NULL account", + e); } else { - Log_OC.e(TAG, "Error while trying to get authorization for " + mLastTarget.mAccount.name, e); + Log_OC.e(TAG, "Error while trying to get authorization for " + + mLastTarget.mAccount.name, e); } result = new RemoteOperationResult(e); } catch (Exception e) { @@ -503,7 +521,8 @@ public class OperationsService extends Service { * TODO - move to ServiceHandler (probably) * * @param operationIntent Intent describing a new operation to queue and execute. - * @return Pair with the new operation object and the information about its target server. + * @return Pair with the new operation object and the information about its + * target server. */ private Pair newOperation(Intent operationIntent) { RemoteOperation operation = null; @@ -569,19 +588,22 @@ public class OperationsService extends Service { } else if (action.equals(ACTION_REMOVE)) { // Remove file or folder String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH); - boolean onlyLocalCopy = operationIntent.getBooleanExtra(EXTRA_REMOVE_ONLY_LOCAL, false); + boolean onlyLocalCopy = operationIntent.getBooleanExtra(EXTRA_REMOVE_ONLY_LOCAL, + false); operation = new RemoveFileOperation(remotePath, onlyLocalCopy); } else if (action.equals(ACTION_CREATE_FOLDER)) { // Create Folder String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH); - boolean createFullPath = operationIntent.getBooleanExtra(EXTRA_CREATE_FULL_PATH, true); + boolean createFullPath = operationIntent.getBooleanExtra(EXTRA_CREATE_FULL_PATH, + true); operation = new CreateFolderOperation(remotePath, createFullPath); } else if (action.equals(ACTION_SYNC_FILE)) { // Sync file String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH); - boolean syncFileContents = operationIntent.getBooleanExtra(EXTRA_SYNC_FILE_CONTENTS, true); + boolean syncFileContents = + operationIntent.getBooleanExtra(EXTRA_SYNC_FILE_CONTENTS, true); operation = new SynchronizeFileOperation( remotePath, account, syncFileContents, getApplicationContext() ); @@ -590,7 +612,7 @@ public class OperationsService extends Service { // Sync file String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH); operation = new SynchronizeFolderOperation( - this, // TODO remove this dependency from construction time + this, // TODO remove this dependency from construction time remotePath, account, System.currentTimeMillis() // TODO remove this dependency from construction time @@ -621,7 +643,8 @@ public class OperationsService extends Service { /** * Sends a broadcast when a new operation is added to the queue. * - * Local broadcasts are only delivered to activities in the same process, but can't be done sticky :\ + * Local broadcasts are only delivered to activities in the same process, but can't be + * done sticky :\ * * @param target Account or URL pointing to an OC server. * @param operation Added operation. @@ -642,7 +665,8 @@ public class OperationsService extends Service { // TODO - maybe add a notification for real start of operations /** - * Sends a LOCAL broadcast when an operations finishes in order to the interested activities can update their view + * Sends a LOCAL broadcast when an operations finishes in order to the interested activities c + * an update their view * * Local broadcasts are only delivered to activities in the same process. * @@ -650,7 +674,8 @@ public class OperationsService extends Service { * @param operation Finished operation. * @param result Result of the operation. */ - private void sendBroadcastOperationFinished(Target target, RemoteOperation operation, RemoteOperationResult result) { + private void sendBroadcastOperationFinished(Target target, RemoteOperation operation, + RemoteOperationResult result) { Intent intent = new Intent(ACTION_OPERATION_FINISHED); intent.putExtra(EXTRA_RESULT, result); if (target.mAccount != null) { @@ -674,7 +699,8 @@ public class OperationsService extends Service { final RemoteOperation operation, final RemoteOperationResult result ) { int count = 0; - Iterator listeners = mOperationsBinder.mBoundListeners.keySet().iterator(); + Iterator listeners = + mOperationsBinder.mBoundListeners.keySet().iterator(); while (listeners.hasNext()) { final OnRemoteOperationListener listener = listeners.next(); final Handler handler = mOperationsBinder.mBoundListeners.get(listener); diff --git a/src/com/owncloud/android/services/SyncFolderHandler.java b/src/com/owncloud/android/services/SyncFolderHandler.java index 57271eb5..e76a2dcf 100644 --- a/src/com/owncloud/android/services/SyncFolderHandler.java +++ b/src/com/owncloud/android/services/SyncFolderHandler.java @@ -27,6 +27,7 @@ import android.os.Looper; import android.os.Message; import android.util.Pair; +import com.owncloud.android.MainApp; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; @@ -117,7 +118,7 @@ class SyncFolderHandler extends Handler { // always get client from client manager, to get fresh credentials in case of update OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService); mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService); + getClientFor(ocAccount, mService, MainApp.getUserAgent()); result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager); @@ -135,7 +136,8 @@ class SyncFolderHandler extends Handler { } } - public void add(Account account, String remotePath, SynchronizeFolderOperation syncFolderOperation){ + public void add(Account account, String remotePath, + SynchronizeFolderOperation syncFolderOperation){ mPendingOperations.putIfAbsent(account, remotePath, syncFolderOperation); sendBroadcastNewSyncFolder(account, remotePath); // TODO upgrade! } @@ -170,26 +172,29 @@ class SyncFolderHandler extends Handler { } /** - * TODO review this method when "folder synchronization" replaces "folder download"; this is a fast and ugly - * patch. + * TODO review this method when "folder synchronization" replaces "folder download"; + * this is a fast and ugly patch. */ private void sendBroadcastNewSyncFolder(Account account, String remotePath) { Intent added = new Intent(FileDownloader.getDownloadAddedMessage()); added.putExtra(FileDownloader.ACCOUNT_NAME, account.name); added.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath); - added.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath); + added.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + + remotePath); mService.sendStickyBroadcast(added); } /** - * TODO review this method when "folder synchronization" replaces "folder download"; this is a fast and ugly - * patch. + * TODO review this method when "folder synchronization" replaces "folder download"; + * this is a fast and ugly patch. */ - private void sendBroadcastFinishedSyncFolder(Account account, String remotePath, boolean success) { + private void sendBroadcastFinishedSyncFolder(Account account, String remotePath, + boolean success) { Intent finished = new Intent(FileDownloader.getDownloadFinishMessage()); finished.putExtra(FileDownloader.ACCOUNT_NAME, account.name); finished.putExtra(FileDownloader.EXTRA_REMOTE_PATH, remotePath); - finished.putExtra(FileDownloader.EXTRA_FILE_PATH, FileStorageUtils.getSavePath(account.name) + remotePath); + finished.putExtra(FileDownloader.EXTRA_FILE_PATH, + FileStorageUtils.getSavePath(account.name) + remotePath); finished.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, success); mService.sendStickyBroadcast(finished); } diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 7ccbc118..e17cf8da 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -28,6 +28,7 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; +import com.owncloud.android.MainApp; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; @@ -64,7 +65,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends this.setAccountManager(AccountManager.get(context)); } - public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, boolean allowParallelSyncs) { + public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, + boolean allowParallelSyncs) { super(context, autoInitialize, allowParallelSyncs); this.setAccountManager(AccountManager.get(context)); } @@ -101,11 +103,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends return mStoreManager; } - protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException { + protected void initClientForCurrentAccount() throws OperationCanceledException, + AuthenticatorException, IOException, AccountNotFoundException { AccountUtils.constructFullURLForAccount(getContext(), account); OwnCloudAccount ocAccount = new OwnCloudAccount(account, getContext()); mClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, getContext()); + getClientFor(ocAccount, getContext(), MainApp.getUserAgent()); } protected OwnCloudClient getClient() { diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index 31d1d2dc..9c340200 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -39,10 +39,10 @@ import android.webkit.WebView; import android.widget.RelativeLayout; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; -import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.utils.Log_OC; @@ -70,10 +70,9 @@ public class SamlWebViewDialog extends SherlockDialogFragment { /** * Public factory method to get dialog instances. - * - * @param handler - * @param Url Url to open at WebView - * @param targetURL mBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType) + * + * @param url Url to open at WebView + * @param targetUrl mBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType) * @return New dialog instance, ready to show. */ public static SamlWebViewDialog newInstance(String url, String targetUrl) { @@ -101,7 +100,8 @@ public class SamlWebViewDialog extends SherlockDialogFragment { mWebViewClient = new SsoWebViewClient(activity, mHandler, mSsoWebViewClientListener); } catch (ClassCastException e) { - throw new ClassCastException(activity.toString() + " must implement " + SsoWebViewClientListener.class.getSimpleName()); + throw new ClassCastException(activity.toString() + " must implement " + + SsoWebViewClientListener.class.getSimpleName()); } } @@ -130,11 +130,13 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @SuppressWarnings("deprecation") @SuppressLint("SetJavaScriptEnabled") @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { Log_OC.v(TAG, "onCreateView, savedInsanceState is " + savedInstanceState); // Inflate layout of the dialog - RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, container, false); // null parent view because it will go in the dialog layout + RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, + container, false); // null parent view because it will go in the dialog layout if (mSsoWebView == null) { // initialize the WebView @@ -148,7 +150,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { webSettings.setBuiltInZoomControls(false); webSettings.setLoadWithOverviewMode(false); webSettings.setSavePassword(false); - webSettings.setUserAgentString(OwnCloudClient.USER_AGENT); + webSettings.setUserAgentString(MainApp.getUserAgent()); webSettings.setSaveFormData(false); CookieManager cookieManager = CookieManager.getInstance();