locations add/get

app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
@@ -28,6 +28,7 @@
         <service
             android:name=".business.CamotionAccountBusiness"
             android:exported="true"
+            android:label="@string/app_name"
             android:process=":auth">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
@@ -38,7 +39,8 @@
                 android:resource="@xml/authenticator"/>
         </service>
 
-        <activity android:name=".AddAccountActivity">
+        <activity android:name=".ui.AddAccountActivity"
+            android:label="@string/add_location_title">
         </activity>
 
     </application>

app/src/main/java/com/rthoni/camotion/AddAccountActivity.java

@@ -1,13 +0,0 @@
-package com.rthoni.camotion;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-public class AddAccountActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_add_account);
-    }
-}

app/src/main/java/com/rthoni/camotion/business/CamotionAccountBusiness.java

@@ -12,7 +12,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.rthoni.camotion.AddAccountActivity;
+import com.rthoni.camotion.ui.AddAccountActivity;
 
 /**
  *

app/src/main/java/com/rthoni/camotion/business/CamotionBusiness.java

@@ -1,16 +1,45 @@
 package com.rthoni.camotion.business;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
+
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.dbo.LocationDbo;
+
+import java.util.List;
+import java.util.Vector;
 
 /**
+ *
  * Created by robin on 11/28/15.
  */
 public class CamotionBusiness {
 
-    public static LuDataAccessConfigDbo getConfig()
+    public static LuDataAccessConfigDbo getConfig(LocationDbo location)
     {
         LuDataAccessConfigDbo config = new LuDataAccessConfigDbo();
-        config.setBaseUrl("http://camotion.gigi.rthoni.com");
+        config.setBaseUrl(location.getBaseUrl());
         return config;
     }
+
+    public static List<LocationDbo> getLocations(Context context)
+    {
+        List<LocationDbo> locations = new Vector<>();
+        AccountManager accountManager = AccountManager.get(context);
+        for (Account account : accountManager.getAccountsByType(context.getString(R.string.account_type))) {
+            LocationDbo location = new LocationDbo();
+            String[] split = account.name.split("@");
+
+            location.setPassword(accountManager.getPassword(account));
+            location.setHttps(accountManager.getUserData(account, "Https").equals("true"));
+            location.setDomain(accountManager.getUserData(account, "Domain"));
+            location.setUsername(split[0]);
+            location.setName(split[1]);
+
+            locations.add(location);
+        }
+        return locations;
+    }
 }

app/src/main/java/com/rthoni/camotion/dbo/LocationDbo.java

@@ -14,12 +14,59 @@ public class LocationDbo extends LuDbo {
 
     private String _name;
 
-    private String _baseUrl;
+    private String _domain;
 
     private String _username;
 
     private String _password;
 
+    private boolean _https;
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public String getDomain() {
+        return _domain;
+    }
+
+    public void setDomain(String domain) {
+        _domain = domain;
+    }
+
+    public String getUsername() {
+        return _username;
+    }
+
+    public void setUsername(String username) {
+        _username = username;
+    }
+
+    public String getPassword() {
+        return _password;
+    }
+
+    public void setPassword(String password) {
+        _password = password;
+    }
+
+    public boolean isHttps() {
+        return _https;
+    }
+
+    public void setHttps(boolean https) {
+        _https = https;
+    }
+
+    public String getBaseUrl()
+    {
+        return (_https ? "https" : "http") + "://" + _domain;
+    }
+
     @Override
     public void fromJson(JSONObject json) throws JSONException {
 

app/src/main/java/com/rthoni/camotion/ui/AddAccountActivity.java

@@ -0,0 +1,140 @@
+package com.rthoni.camotion.ui;
+
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.luticate.auth.dbo.LuLoginDbo;
+import com.luticate.utils.business.LuPromise;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.dbo.LocationDbo;
+import com.rthoni.camotion.ui.dialogs.LoginDialog;
+
+public class AddAccountActivity extends AppCompatActivity {
+
+    private EditText _nameInput;
+    private EditText _usernameInput;
+    private EditText _passwordInput;
+    private EditText _domainInput;
+    private CheckBox _checkBoxHttps;
+
+    private AccountAuthenticatorResponse _response;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_account);
+        _nameInput = (EditText) findViewById(R.id.name_input);
+        _usernameInput = (EditText) findViewById(R.id.username_input);
+        _passwordInput = (EditText) findViewById(R.id.password_input);
+        _domainInput = (EditText) findViewById(R.id.domain_input);
+        _checkBoxHttps = (CheckBox) findViewById(R.id.checkBoxHttps);
+
+        findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                check();
+            }
+        });
+        findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setResult(Activity.RESULT_CANCELED);
+                finish();
+            }
+        });
+
+        Bundle extras = getIntent().getExtras();
+
+        if (extras != null) {
+            _response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+        }
+    }
+
+    private LocationDbo validate()
+    {
+        LocationDbo location = new LocationDbo();
+        location.setName(_nameInput.getText().toString());
+        location.setUsername(_usernameInput.getText().toString());
+        location.setPassword(_passwordInput.getText().toString());
+        location.setDomain(_domainInput.getText().toString());
+        location.setHttps(_checkBoxHttps.isChecked());
+
+        _nameInput.setError(null);
+        _usernameInput.setError(null);
+        _passwordInput.setError(null);
+        _domainInput.setError(null);
+
+        if (location.getName().isEmpty()) {
+            _nameInput.setError(getResources().getString(R.string.error_name));
+            _nameInput.requestFocus();
+            return null;
+        }
+
+        if (location.getUsername().isEmpty()) {
+            _usernameInput.setError(getResources().getString(R.string.error_username));
+            _usernameInput.requestFocus();
+            return null;
+        }
+
+        if (location.getPassword().isEmpty()) {
+            _passwordInput.setError(getResources().getString(R.string.error_password));
+            _passwordInput.requestFocus();
+            return null;
+        }
+
+        if (location.getDomain().isEmpty()) {
+            _domainInput.setError(getResources().getString(R.string.error_domain));
+            _domainInput.requestFocus();
+            return null;
+        }
+
+        return location;
+    }
+
+    private void addAccount(LocationDbo location)
+    {
+        String username = location.getUsername() + "@" + location.getName();
+
+        AccountManager accountManager = AccountManager.get(this);
+        Account newUserAccount = new Account(username, getResources().getString(R.string.account_type));
+        boolean accountCreated = accountManager.addAccountExplicitly(newUserAccount, location.getPassword(), null);
+
+        if (accountCreated && _response != null) {
+            accountManager.setUserData(newUserAccount, "Https", location.isHttps() ? "true" : "false");
+            accountManager.setUserData(newUserAccount, "Domain", location.getDomain());
+            Bundle result = new Bundle();
+            result.putString(AccountManager.KEY_ACCOUNT_NAME, username);
+            result.putString(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.account_type));
+            _response.onResult(result);
+            finish();
+        }
+    }
+
+    private void check()
+    {
+        final LocationDbo location = validate();
+        if (location == null) {
+            return;
+        }
+        LoginDialog dlg = new LoginDialog(this);
+        dlg.login(location).then(new LuPromise.LuConsumer<LuLoginDbo>() {
+            @Override
+            public void execute(LuLoginDbo data) {
+                addAccount(location);
+            }
+        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+            @Override
+            public void execute(LuPromise.LuPromiseError error) {
+                Toast.makeText(AddAccountActivity.this, error.toString(), Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+}

app/src/main/java/com/rthoni/camotion/MainActivity.java → app/src/main/java/com/rthoni/camotion/ui/MainActivity.java

@@ -1,4 +1,4 @@
-package com.rthoni.camotion;
+package com.rthoni.camotion.ui;
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
@@ -16,7 +16,11 @@ import android.view.MenuItem;
 import com.luticate.auth.business.LuticateUsersBusiness;
 import com.luticate.auth.dbo.LuFullLoginDbo;
 import com.luticate.utils.business.LuPromise;
+import com.rthoni.camotion.R;
 import com.rthoni.camotion.business.CamotionBusiness;
+import com.rthoni.camotion.dbo.LocationDbo;
+
+import java.util.List;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -32,7 +36,7 @@ public class MainActivity extends AppCompatActivity
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                LuticateUsersBusiness.loginFull(CamotionBusiness.getConfig(), "user", "test42")
+                /*LuticateUsersBusiness.loginFull(CamotionBusiness.getConfig(), "user", "test42")
                         .then(new LuPromise.LuConsumer<LuFullLoginDbo>() {
                             @Override
                             public void execute(LuFullLoginDbo data) {
@@ -43,13 +47,14 @@ public class MainActivity extends AppCompatActivity
                             public void execute(LuPromise.LuPromiseError error) {
                                 Log.e("Login", error.toString());
                             }
-                        });
+                        });*/
+                //List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
             }
         });
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
+                R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         drawer.setDrawerListener(toggle);
         toggle.syncState();
 

app/src/main/java/com/rthoni/camotion/ui/dialogs/LoginDialog.java

@@ -0,0 +1,48 @@
+package com.rthoni.camotion.ui.dialogs;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+
+import com.luticate.auth.business.LuticateUsersBusiness;
+import com.luticate.auth.dbo.LuLoginDbo;
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dataaccess.LuDataAccess;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.dbo.LocationDbo;
+
+/**
+ *
+ * Created by robin on 11/28/15.
+ */
+public class LoginDialog extends ProgressDialog {
+    public LoginDialog(Context context) {
+        super(context);
+        setTitle(R.string.loading);
+        setIndeterminate(true);
+        setMessage(context.getString(R.string.login_progress));
+    }
+
+    public LuPromise<LuLoginDbo> login(LocationDbo location)
+    {
+        final LuPromise<LuLoginDbo> promise = new LuPromise<>();
+        show();
+        LuDataAccessConfigDbo config = new LuDataAccessConfigDbo();
+        config.setBaseUrl(location.getBaseUrl());
+        LuticateUsersBusiness.login(config, location.getUsername(), location.getPassword())
+                .then(new LuPromise.LuConsumer<LuLoginDbo>() {
+                    @Override
+                    public void execute(LuLoginDbo data) {
+                        hide();
+                        promise.resolve(data);
+                    }
+                }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                    @Override
+                    public void execute(LuPromise.LuPromiseError data) {
+                        hide();
+                        promise.reject(data);
+                    }
+                });
+        return promise;
+    }
+}

app/src/main/res/layout/activity_add_account.xml

@@ -3,7 +3,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                tools:context="com.rob57530.camotion.ui.AddLocationActivity">
+                tools:context=".ui.AddAccountActivity">
 
 
     <ScrollView
@@ -33,6 +33,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/name"
+                android:nextFocusDown="@+id/username_input"
+                android:singleLine="true"
                 android:id="@+id/name_input"
                 />
 
@@ -40,12 +42,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/username"
-                android:id="@+id/username_input"
-                />
+                android:singleLine="true"
+                android:id="@+id/username_input"/>
 
             <EditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:singleLine="true"
                 android:id="@+id/password_input"
                 android:inputType="textPassword"
                 android:hint="@string/password"
@@ -55,32 +58,17 @@
             <EditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/api_entrypoint_input"
-                android:hint="@string/api_entrypoint"
-                android:layout_gravity="center_horizontal"
-                />
+                android:hint="@string/domain"
+                android:singleLine="true"
+                android:id="@+id/domain_input"
+                android:inputType="textUri"/>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/check_account"
-                    android:id="@+id/test"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_alignParentTop="true"
-                    android:layout_centerHorizontal="true"/>
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/imageView"
-                    android:layout_alignParentTop="true"
-                    android:layout_toRightOf="@+id/test"
-                    android:layout_toEndOf="@+id/test"/>
-            </RelativeLayout>
+            <CheckBox
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="HTTPS"
+                android:checked="true"
+                android:id="@+id/checkBoxHttps"/>
 
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/app_bar_main.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.rthoni.camotion.MainActivity">
+    tools:context=".ui.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"

app/src/main/res/layout/content_main.xml

@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.rthoni.camotion.MainActivity"
+    tools:context=".ui.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
     <TextView

app/src/main/res/values/strings.xml

@@ -1,6 +1,8 @@
 <resources>
     <string name="app_name">Camotion</string>
 
+    <string name="add_location_title">Add Camotion Account</string>
+
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
@@ -11,6 +13,15 @@
     <string name="name">Location name</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
+    <string name="domain">Domain</string>
     <string name="check_account">Check account</string>
-    <string name="api_entrypoint">API entry point</string>
+
+    <string name="error_name">Location name is required</string>
+    <string name="error_username">Username is required</string>
+    <string name="error_password">Password is required</string>
+    <string name="error_domain">Domain is required</string>
+    <string name="account_type">com.rthoni.luticate.account</string>
+
+    <string name="loading">Loading…</string>
+    <string name="login_progress">Logging in…</string>
 </resources>

luticateauth/src/main/java/com/luticate/auth/dbo/LuVoidPromise.java

@@ -0,0 +1,9 @@
+package com.luticate.auth.dbo;
+
+import com.luticate.utils.business.LuPromise;
+
+/**
+ * Created by robin on 11/28/15.
+ */
+public class LuVoidPromise extends LuPromise<Void> {
+}