changes due to CR

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/authentication/AccountUtils.java

@@ -214,12 +214,10 @@ public class AccountUtils {
     }
 
     public static boolean hasSearchUsersSupport(Account account) {
-        OwnCloudVersion serverVersion = getServerVersion(account);
-        return serverVersion.isSearchUsersSupported();
+        return getServerVersion(account).isSearchUsersSupported();
     }
 
     public static boolean hasSearchSupport(Account account) {
-        OwnCloudVersion serverVersion = getServerVersion(account);
-        return serverVersion.isSearchSupported();
+        return getServerVersion(account).isSearchSupported();
     }
 }

src/main/java/com/owncloud/android/ui/activity/ShareActivity.java

@@ -39,7 +39,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.operations.CreateShareViaLinkOperation;
 import com.owncloud.android.operations.GetSharesForFileOperation;
 import com.owncloud.android.operations.UnshareOperation;
@@ -149,9 +148,8 @@ public class ShareActivity extends FileActivity implements ShareFragmentListener
             return OCShare.READ_PERMISSION_FLAG;    // minimum permissions
 
         } else if (isFederated) {
-            OwnCloudVersion serverVersion = com.owncloud.android.authentication.AccountUtils
-                    .getServerVersion(getAccount());
-            if (serverVersion.isNotReshareableFederatedSupported()) {
+            if (com.owncloud.android.authentication.AccountUtils
+                    .getServerVersion(getAccount()).isNotReshareableFederatedSupported()) {
                 return (getFile().isFolder() ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 :
                         OCShare.FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9);
             } else {

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -75,7 +75,6 @@ import com.owncloud.android.lib.resources.files.SearchOperation;
 import com.owncloud.android.lib.resources.files.ToggleEncryptionOperation;
 import com.owncloud.android.lib.resources.files.ToggleFavoriteOperation;
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.FolderPickerActivity;
@@ -1215,10 +1214,8 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         
             updateFooter();
             // decide grid vs list view
-            OwnCloudVersion version = AccountUtils.getServerVersion(
-                    ((FileActivity) mContainerActivity).getAccount());
-            if ( version.supportsRemoteThumbnails() &&
-                    isGridViewPreferred(mFile)) {
+            if ( AccountUtils.getServerVersion(((FileActivity) mContainerActivity).getAccount())
+            .supportsRemoteThumbnails() && isGridViewPreferred(mFile)) {
                 switchToGridView();
             } else {
                 switchToListView();

src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -386,8 +386,7 @@ public class FileOperationsHelper {
      */
     public boolean isSharedSupported() {
         if (mFileActivity.getAccount() != null) {
-            OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mFileActivity.getAccount());
-            return serverVersion.isSharedSupported();
+            return AccountUtils.getServerVersion(mFileActivity.getAccount()).isSharedSupported();
         }
         return false;
     }
@@ -552,9 +551,7 @@ public class FileOperationsHelper {
         if (hideFileListing) {
             updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.CREATE_PERMISSION_FLAG);
         } else {
-            OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mFileActivity.getAccount());
-
-            if (serverVersion.isNotReshareableFederatedSupported()) {
+            if (AccountUtils.getServerVersion(mFileActivity.getAccount()).isNotReshareableFederatedSupported()) {
                 updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
                         OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9);
             } else {
@@ -854,8 +851,7 @@ public class FileOperationsHelper {
      */
     public boolean isVersionWithForbiddenCharacters() {
         if (mFileActivity.getAccount() != null) {
-            OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mFileActivity.getAccount());
-            return serverVersion.isVersionWithForbiddenCharacters();
+            return AccountUtils.getServerVersion(mFileActivity.getAccount()).isVersionWithForbiddenCharacters();
         }
         return false;
     }

src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.java

@@ -30,7 +30,6 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -59,9 +58,8 @@ public class HttpStreamFetcher implements DataFetcher<InputStream> {
         OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                 getClientFor(ocAccount, MainApp.getAppContext());
 
-        OwnCloudVersion serverOCVersion = AccountUtils.getServerVersion(mAccount);
         if (mClient != null) {
-            if (serverOCVersion.supportsRemoteThumbnails()) {
+            if (AccountUtils.getServerVersion(mAccount).supportsRemoteThumbnails()) {
                 GetMethod get = null;
                 try {
                     get = new GetMethod(mURL);