From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 23 Jan 2014 12:59:29 +0000 (+0100)
Subject: Fixed crash in first installation
X-Git-Tag: oc-android-1.5.5~35^2~52
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0e4c56f3161cefc49c0eb91eea2a84a02e2775a3

Fixed crash in first installation

Conflicts:
	src/com/owncloud/android/ui/activity/FileActivity.java
---

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index f0038662..2a822006 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -71,10 +71,6 @@ public abstract class FileActivity extends SherlockFragmentActivity {
     /** Flag to signal if the activity is launched by a notification */
     private boolean mFromNotification;
     
-    /** Flag to signal if the server supports the Share API */
-    private boolean mIsSharedSupported;
-    
-    
 
     
     /**
@@ -149,11 +145,6 @@ public abstract class FileActivity extends SherlockFragmentActivity {
         } else {
             swapToDefaultAccount();
         }
-        
-        AccountManager accountMngr = AccountManager.get(getBaseContext()); 
-        if (mAccount != null) {
-            mIsSharedSupported = Boolean.parseBoolean(accountMngr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
-        }
     }
 
     
@@ -260,14 +251,13 @@ public abstract class FileActivity extends SherlockFragmentActivity {
      *  @return 'True' if the server supports the Share API
      */
     public boolean isSharedSupported() {
-        return mIsSharedSupported;
+        if (getAccount() != null) {
+            AccountManager accountManager = AccountManager.get(this);
+            return Boolean.getBoolean(accountManager.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
+        }
+        return false;
     }
 
-
-    public void setIsSharedSupported(boolean isSharedSupported) {
-        this.mIsSharedSupported = isSharedSupported;
-    }
-    
     /**
      * Helper class handling a callback from the {@link AccountManager} after the creation of
      * a new ownCloud {@link Account} finished, successfully or not.