Merge branch 'release-1.4.1'

AndroidManifest.xml

@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="104000"
-    android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="104001"
+    android:versionName="1.4.1" 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" />

res/xml/preferences.xml

@@ -35,12 +35,13 @@
         				android:disableDependentsState="true" 
         				android:title="@string/instant_upload_on_wifi" 
         				android:key="instant_upload_on_wifi"/>
-    <CheckBoxPreference android:key="log_to_file" 
+    <!-- DISABLED FOR RELEASE UNTIL FIXED 
+    CheckBoxPreference android:key="log_to_file" 
                         android:title="@string/prefs_log_title"  
                         android:summary="@string/prefs_log_summary"/>
 	<Preference 		android:key="log_history" 
                         android:title="@string/prefs_log_title_history"  
-                        android:summary="@string/prefs_log_summary_history"/>
+                        android:summary="@string/prefs_log_summary_history"/ -->
 	<Preference 		android:id="@+id/about_app" 
         				android:title="@string/about_title" 
         				android:key="about_app" />

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

@@ -16,13 +16,13 @@
  *
  */
 
-package com.owncloud.android;
+package com.owncloud.android.authentication;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AccountsException;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -136,21 +136,37 @@ public class AccountUtils {
      * @param context
      * @param account
      * @return url or null on failure
+     * @throws AccountNotFoundException     When 'account' is unknown for the AccountManager
      */
-    public static String constructFullURLForAccount(Context context, Account account) {
-        try {
-            AccountManager ama = AccountManager.get(context);
-            String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
-            String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
-            boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
-            OwnCloudVersion ver = new OwnCloudVersion(strver);
-            String webdavpath = getWebdavPath(ver, supportsOAuth);
+    public static String constructFullURLForAccount(Context context, Account account) throws AccountNotFoundException {
+        AccountManager ama = AccountManager.get(context);
+        String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
+        String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
+        boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
+        OwnCloudVersion ver = new OwnCloudVersion(strver);
+        String webdavpath = getWebdavPath(ver, supportsOAuth);
 
-            if (webdavpath == null) return null;
-            return baseurl + webdavpath;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+        if (baseurl == null || webdavpath == null) 
+            throw new AccountNotFoundException(account, "Account not found", null);
+        
+        return baseurl + webdavpath;
+    }
+    
+    
+    public static class AccountNotFoundException extends AccountsException {
+        
+        /** Generated - should be refreshed every time the class changes!! */
+        private static final long serialVersionUID = -9013287181793186830L;
+        
+        private Account mFailedAccount; 
+                
+        public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
+            super(message, cause);
+            mFailedAccount = failedAccount;
+        }
+        
+        public Account getFailedAccount() {
+            return mFailedAccount;
         }
     }
 

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -18,7 +18,6 @@
 
 package com.owncloud.android.authentication;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
@@ -1271,7 +1270,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * Called from SslValidatorDialog when a new server certificate was correctly saved.
      */
     public void onSavedCertificate() {
-        mOperationThread = mOcServerChkOperation.retry(this, mHandler);                
+        checkOcServer();
     }
 
     /**

src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java

@@ -20,8 +20,8 @@ package com.owncloud.android.files;
 
 import java.io.File;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
 

src/com/owncloud/android/network/OwnCloudClientUtils.java

@@ -36,8 +36,9 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.Log_OC;
 
 import eu.alefzero.webdav.WebdavClient;
@@ -83,8 +84,9 @@ public class OwnCloudClientUtils {
      * @throws AuthenticatorException       If the authenticator failed to get the authorization token for the account.
      * @throws OperationCanceledException   If the authenticator operation was cancelled while getting the authorization token for the account. 
      * @throws IOException                  If there was some I/O error while getting the authorization token for the account.
+     * @throws AccountNotFoundException     If 'account' is unknown for the AccountManager
      */
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException {
+    public static WebdavClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
         //Log_OC.d(TAG, "Creating WebdavClient associated to " + account.name);
        
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
@@ -105,7 +107,7 @@ public class OwnCloudClientUtils {
     }
     
     
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException {
+    public static WebdavClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
         WebdavClient client = createOwnCloudClient(uri, appContext);
         AccountManager am = AccountManager.get(appContext);

src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java

@@ -22,8 +22,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;

src/com/owncloud/android/operations/RemoteOperationResult.java

@@ -32,7 +32,11 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.network.CertificateCombinedException;
 
 /**
@@ -46,7 +50,8 @@ import com.owncloud.android.network.CertificateCombinedException;
 public class RemoteOperationResult implements Serializable {
 
     /** Generated - should be refreshed every time the class changes!! */
-    private static final long serialVersionUID = -7805531062432602444L;
+    private static final long serialVersionUID = 6106167714625712390L;
+
     
     private static final String TAG = "RemoteOperationResult";
     
@@ -77,7 +82,9 @@ public class RemoteOperationResult implements Serializable {
         LOCAL_STORAGE_NOT_MOVED, 
         LOCAL_STORAGE_NOT_COPIED, 
         OAUTH2_ERROR_ACCESS_DENIED,
-        QUOTA_EXCEEDED
+        QUOTA_EXCEEDED, 
+        ACCOUNT_NOT_FOUND, 
+        ACCOUNT_EXCEPTION
     }
 
     private boolean mSuccess = false;
@@ -142,6 +149,12 @@ public class RemoteOperationResult implements Serializable {
         } else if (e instanceof UnknownHostException) {
             mCode = ResultCode.HOST_NOT_AVAILABLE;
 
+        } else if (e instanceof AccountNotFoundException) {
+            mCode = ResultCode.ACCOUNT_NOT_FOUND;
+            
+        } else if (e instanceof AccountsException) {
+            mCode = ResultCode.ACCOUNT_EXCEPTION;
+            
         } else if (e instanceof SSLException || e instanceof RuntimeException) {
             CertificateCombinedException se = getCertificateCombinedException(e);
             if (se != null) {
@@ -242,6 +255,13 @@ public class RemoteOperationResult implements Serializable {
             } else if (mException instanceof IOException) {
                 return "Unrecovered transport exception";
 
+            } else if (mException instanceof AccountNotFoundException) {
+                Account failedAccount = ((AccountNotFoundException)mException).getFailedAccount();
+                return mException.getMessage() + " (" + (failedAccount != null ? failedAccount.name : "NULL") + ")";
+                
+            } else if (mException instanceof AccountsException) {
+                return "Exception while using account";
+                
             } else {
                 return "Unexpected exception";
             }

src/com/owncloud/android/operations/UpdateOCVersionOperation.java

@@ -26,8 +26,8 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.OwnCloudVersion;

src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -28,7 +28,8 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.protocol.HttpContext;
 
-import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.network.OwnCloudClientUtils;
 
@@ -142,10 +143,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         return null;
     }
 
-    protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException {
-        if (AccountUtils.constructFullURLForAccount(getContext(), account) == null) {
-            throw new UnknownHostException();
-        }
+    protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
+        AccountUtils.constructFullURLForAccount(getContext(), account);
         mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());
     }
     

src/com/owncloud/android/syncadapter/ContactSyncAdapter.java

@@ -24,8 +24,8 @@ import java.io.IOException;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/com/owncloud/android/ui/activity/AccountSelectActivity.java

@@ -47,8 +47,8 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 
 import com.owncloud.android.R;

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -29,10 +29,10 @@ import android.os.Bundle;
 import android.webkit.MimeTypeMap;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavUtils;

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1043,6 +1043,7 @@ public class FileDisplayActivity extends FileActivity implements
     @Override
     public void onFileStateChanged() {
         refeshListOfFilesFragment();
+        updateNavigationElementsInActionBar(getSecondFragment().getFile());
     }
 
     

src/com/owncloud/android/ui/activity/InstantUploadActivity.java

@@ -41,9 +41,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;
 import com.owncloud.android.files.services.FileUploader;

src/com/owncloud/android/ui/activity/Preferences.java

@@ -111,6 +111,7 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
                }
        }
        
+       /* DISABLED FOR RELEASE UNTIL FIXED 
        pLogging = (CheckBoxPreference) findPreference("log_to_file");
        if (pLogging != null) {
            pLogging.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@@ -145,6 +146,8 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
             }
         });
        }
+       */
+       
       }
     }
 

src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java

@@ -1,159 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
- *   Copyright (C) 2012-2013 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.adapter;
-
-import java.io.File;
-
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
-
-import com.owncloud.android.AccountUtils;
-import com.owncloud.android.R;
-import eu.alefzero.webdav.WebdavUtils;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.DataSetObserver;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-public class FileListActionListAdapter implements ListAdapter {
-
-    private Context mContext;
-    private Account mAccount;
-    private String mFilename, mFileType, mFilePath, mFileStoragePath;
-
-    private final int ITEM_DOWNLOAD = 0;
-
-    // private final int ITEM_SHARE = 1;
-
-    public FileListActionListAdapter(Cursor c, Context co, Account account) {
-        mContext = co;
-        mFilename = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NAME));
-        mFileType = c.getString(c
-                .getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));
-        mFilePath = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH));
-        mFileStoragePath = c.getString(c
-                .getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
-        // mItemId = c.getString(c.getColumnIndex(ProviderTableMeta._ID));
-        mAccount = account;
-    }
-
-    public boolean areAllItemsEnabled() {
-        return true;
-    }
-
-    public boolean isEnabled(int position) {
-        return true;
-    }
-
-    public int getCount() {
-        return 1;
-    }
-
-    public Object getItem(int position) {
-        if (position == 0) {
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            if (TextUtils.isEmpty(mFileStoragePath)) {
-                intent.putExtra("toDownload", true);
-                AccountManager accm = (AccountManager) mContext
-                        .getSystemService(Context.ACCOUNT_SERVICE);
-                String ocurl = accm.getUserData(mAccount,
-                        AccountUtils.constructFullURLForAccount(mContext, mAccount));
-                ocurl += WebdavUtils.encodePath(mFilePath + mFilename);
-                intent.setData(Uri.parse(ocurl));
-            } else {
-                intent.putExtra("toDownload", false);
-                intent.setDataAndType(Uri.fromFile(new File(mFileStoragePath)),
-                        mFileType);
-            }
-            return intent;
-        }
-        return null;
-    }
-
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    public int getItemViewType(int position) {
-        return 0;
-    }
-
-    public View getView(int position, View convertView, ViewGroup parent) {
-        View v = convertView;
-        if (v == null) {
-            LayoutInflater vi = (LayoutInflater) mContext
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            v = vi.inflate(R.layout.file_display_action_list_element, null);
-        }
-
-        TextView tv;
-        ImageView iv;
-        switch (position) {
-        case ITEM_DOWNLOAD:
-            tv = (TextView) v.findViewById(R.id.textView1);
-            if (mFileStoragePath == null) {
-                tv.setText("Download");
-            } else {
-                setActionName(tv);
-            }
-            iv = (ImageView) v.findViewById(R.id.imageView1);
-            iv.setImageResource(R.drawable.download);
-            break;
-        }
-
-        return v;
-    }
-
-    public int getViewTypeCount() {
-        return 2;
-    }
-
-    public boolean hasStableIds() {
-        return false;
-    }
-
-    public boolean isEmpty() {
-        return false;
-    }
-
-    public void registerDataSetObserver(DataSetObserver observer) { }
-
-    public void unregisterDataSetObserver(DataSetObserver observer) { }
-
-    private void setActionName(TextView tv) {
-        if (mFileType.matches("image/.*")) {
-            tv.setText("View");
-        } else if (mFileType.matches("audio/.*")
-                || mFileType.matches("video/.*")) {
-            tv.setText("Play");
-        } else {
-            tv.setText("Open");
-        }
-    }
-
-}

src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -32,9 +32,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.DisplayUtils;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;

src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java

@@ -17,7 +17,7 @@
  */
 package com.owncloud.android.ui.adapter;
 
-import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.Preferences;
 

src/com/owncloud/android/ui/dialog/SslValidatorDialog.java

@@ -18,6 +18,7 @@
 package com.owncloud.android.ui.dialog;
 
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
@@ -111,7 +112,13 @@ public class SslValidatorDialog extends Dialog {
                             else
                                 Log_OC.d(TAG, "Nobody there to notify the certificate was saved");
                             
-                        } catch (Exception e) {
+                        } catch (GeneralSecurityException e) {
+                            dismiss();
+                            if (mListener != null)
+                                mListener.onFailedSavingCertificate();
+                            Log_OC.e(TAG, "Server certificate could not be saved in the known servers trust store ", e);
+                            
+                        } catch (IOException e) {
                             dismiss();
                             if (mListener != null)
                                 mListener.onFailedSavingCertificate();

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

@@ -21,9 +21,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileHandler;

src/com/owncloud/android/ui/preview/PreviewImageActivity.java

@@ -36,6 +36,7 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -47,7 +48,6 @@ import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 

src/com/owncloud/android/ui/preview/PreviewVideoActivity.java

@@ -32,9 +32,10 @@ import android.view.MotionEvent;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.media.MediaService;
 
@@ -117,9 +118,14 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
                 mVideoPlayer.setVideoPath(mFile.getStoragePath());
                 
             } else if (mAccount != null) {
-                // not working now
-                String url = AccountUtils.constructFullURLForAccount(this, mAccount) + mFile.getRemotePath();
-                mVideoPlayer.setVideoURI(Uri.parse(url));
+                // not working yet
+                String url;
+                try {
+                    url = AccountUtils.constructFullURLForAccount(this, mAccount) + mFile.getRemotePath();
+                    mVideoPlayer.setVideoURI(Uri.parse(url));
+                } catch (AccountNotFoundException e) {
+                    onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
+                }
                 
             } else {
                 onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);

tests/src/com/owncloud/android/test/AccountUtilsTest.java

@@ -20,7 +20,7 @@ package com.owncloud.android.test;
 
 import android.test.AndroidTestCase;
 
-import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 public class AccountUtilsTest extends AndroidTestCase {