0C-1647: Enable/Disable Create Account option

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 8f18d6b..3e53bef 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -8,6 +8,6 @@
     <string name="auth_method_saml_web_sso">off</string>
     
     <!-- Multiaccount support -->
     <string name="auth_method_saml_web_sso">off</string>
     
     <!-- Multiaccount support -->

-    <bool name="multiaccount_support">true</bool>
+    <bool name="multiaccount_support">false</bool>

     
 </resources>
     
 </resources>

diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 2c3448d..295f9a4 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -111,8 +111,11 @@ public class AccountSelectActivity extends SherlockListActivity implements
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

-        MenuInflater inflater = getSherlock().getMenuInflater();
-        inflater.inflate(R.menu.account_picker, menu);
+        // Show Create Account if Multiaccount is enabled
+        if (getResources().getBoolean(R.bool.multiaccount_support)) {
+            MenuInflater inflater = getSherlock().getMenuInflater();
+            inflater.inflate(R.menu.account_picker, menu);
+        }

         return true;
     }
 
         return true;
     }
 


@@ -147,7 +150,6 @@ public class AccountSelectActivity extends SherlockListActivity implements
                             this, 
                             null,                        
                             null);
                             this, 
                             null,                        
                             null);

-            

             return true;
         }
         return false;
             return true;
         }
         return false;


@@ -212,6 +214,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
                 android.R.layout.simple_list_item_single_choice,
                 new String[] { "NAME" }, new int[] { android.R.id.text1 }));
         registerForContextMenu(getListView());
                 android.R.layout.simple_list_item_single_choice,
                 new String[] { "NAME" }, new int[] { android.R.id.text1 }));
         registerForContextMenu(getListView());

+        

     }
 
     @Override
     }
 
     @Override