desktop shortcut

app/src/main/AndroidManifest.xml

@@ -15,9 +15,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:screenOrientation="portrait"
             android:name=".ui.MainActivity"
             android:label="@string/app_name"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -40,10 +40,29 @@
                 android:resource="@xml/authenticator"/>
         </service>
 
-        <activity android:name=".ui.AddAccountActivity"
-            android:label="@string/add_location_title">
+        <activity
+            android:name=".ui.AddAccountActivity"
+            android:label="@string/add_location_title"
+            android:screenOrientation="portrait">
+        </activity>
+
+        <activity
+            android:name=".ui.AddCommandShortcutActivity"
+            android:label="@string/add_shortcut_title"
+            android:launchMode="singleInstance"
+            android:icon="@mipmap/ic_command_bg"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
         </activity>
 
+        <activity android:name=".ui.CommandExecActivity"
+                  android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

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

@@ -23,8 +23,13 @@ public class CommandsBusiness extends LuBusinessManager {
         return CommandsDataAccess.getAll(config, page, perPage);
     }
 
+    public static LuPromise<LuBoolDbo> exec(LuDataAccessConfigDbo config, int commandId)
+    {
+        return CommandsDataAccess.exec(config, commandId);
+    }
+
     public static LuPromise<LuBoolDbo> exec(LuDataAccessConfigDbo config, CommandDbo command)
     {
-        return CommandsDataAccess.exec(config, command.getId());
+        return exec(config, command.getId());
     }
 }

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

@@ -107,4 +107,9 @@ public class LocationDbo extends LuDbo {
         config.setBaseUrl(getBaseUrl());
         return config;
     }
+
+    public String getPseudoMail()
+    {
+        return getUsername() + "@" + getName();
+    }
 }

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

@@ -101,7 +101,7 @@ public class AddAccountActivity extends AppCompatActivity {
 
     private void addAccount(LocationDbo location)
     {
-        String username = location.getUsername() + "@" + location.getName();
+        String username = location.getPseudoMail();
 
         AccountManager accountManager = AccountManager.get(this);
         Account newUserAccount = new Account(username, getResources().getString(R.string.account_type));

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

@@ -0,0 +1,89 @@
+package com.rthoni.camotion.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.luticate.auth.dbo.LuFullLoginDbo;
+import com.luticate.auth.dbo.LuLoginDbo;
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.business.LuRequest;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.dbo.LocationDbo;
+import com.rthoni.camotion.ui.dialogs.LocationPickerDialog;
+import com.rthoni.camotion.ui.dialogs.LoginDialog;
+import com.rthoni.camotion.ui.fragments.AbstractCommandsFragment;
+
+public class AddCommandShortcutActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LuRequest.init(this);
+        setContentView(R.layout.content_main);
+        selectLocation();
+    }
+
+    private void selectLocation()
+    {
+        LocationPickerDialog.getLocation(this)
+                .then(new LuPromise.LuConsumer<LocationDbo>() {
+                    @Override
+                    public void execute(LocationDbo location) {
+                        login(location);
+                    }
+                }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                    @Override
+                    public void execute(LuPromise.LuPromiseError data) {
+                        setResult(RESULT_CANCELED);
+                        finish();
+                    }
+                });
+    }
+
+    private void login(final LocationDbo location)
+    {
+        LoginDialog dlg = new LoginDialog(this);
+        dlg.loginFull(location).then(new LuPromise.LuConsumer<LuFullLoginDbo>() {
+            @Override
+            public void execute(LuFullLoginDbo loginDbo) {
+                showCommands(loginDbo, location);
+            }
+        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+            @Override
+            public void execute(LuPromise.LuPromiseError error) {
+                selectLocation();
+                Toast.makeText(AddCommandShortcutActivity.this, error.toString(), Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    private void showCommands(final LuFullLoginDbo loginDbo, final LocationDbo location)
+    {
+        AbstractCommandsFragment fragment = new AbstractCommandsFragment() {
+            @Override
+            protected void onCommandClicked(CommandDbo command) {
+                addShortcut(location, command);
+            }
+        };
+        fragment.setCamotionDbo(loginDbo, location);
+        getFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
+    }
+
+    private void addShortcut(LocationDbo location, CommandDbo command)
+    {
+        Intent shortcutIntent = new Intent(this, CommandExecActivity.class);
+        shortcutIntent.putExtra("LOCATION_PSEUDO_MAIL", location.getPseudoMail());
+        shortcutIntent.putExtra("COMMAND", command.toString());
+        Intent.ShortcutIconResource iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_command_bg);
+
+        Intent intent = new Intent();
+        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, command.getName());
+        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.rthoni.camotion.ui;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.widget.Toast;
+
+import com.luticate.auth.dbo.LuFullLoginDbo;
+import com.luticate.auth.dbo.LuLoginDbo;
+import com.luticate.utils.business.LuPromise;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.business.CamotionBusiness;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.dbo.LocationDbo;
+import com.rthoni.camotion.ui.dialogs.CommandExecDialog;
+import com.rthoni.camotion.ui.dialogs.LoginDialog;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+
+public class CommandExecActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_command_exec);
+
+        CommandDbo command = new CommandDbo();
+        try {
+            JSONObject commandJson = new JSONObject(getIntent().getStringExtra("COMMAND"));
+            command.fromJson(commandJson);
+        } catch (Exception e) {
+            e.printStackTrace();
+            setResult(RESULT_CANCELED);
+            finish();
+            return;
+        }
+
+        LocationDbo location = getLocation();
+        if (location == null) {
+            setResult(RESULT_CANCELED);
+            finish();
+            return;
+        }
+
+        askConfirmation(command, location);
+    }
+
+    private LocationDbo getLocation()
+    {
+        String locationPseudoMail = getIntent().getStringExtra("LOCATION_PSEUDO_MAIL");
+        List<LocationDbo> locations = CamotionBusiness.getLocations(this);
+        for (LocationDbo location : locations) {
+            if (location.getPseudoMail().equals(locationPseudoMail)) {
+                return location;
+            }
+        }
+        return null;
+    }
+
+    private void askConfirmation(final CommandDbo command, final LocationDbo location)
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(this.getString(R.string.command_confirm, command.getName()))
+                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        login(command, location);
+                    }
+                })
+                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        setResult(RESULT_CANCELED);
+                        finish();
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        setResult(RESULT_CANCELED);
+                        finish();
+                    }
+                })
+                .show();
+    }
+
+    private void login(final CommandDbo command, final LocationDbo location)
+    {
+        LoginDialog dlg = new LoginDialog(this);
+        dlg.login(location).then(new LuPromise.LuConsumer<LuLoginDbo>() {
+            @Override
+            public void execute(LuLoginDbo loginDbo) {
+                CommandExecDialog.showLoadingDialog(location.getConfig(loginDbo), CommandExecActivity.this, command)
+                .then(new LuPromise.LuConsumer<Boolean>() {
+                    @Override
+                    public void execute(Boolean data) {
+                        setResult(RESULT_OK);
+                        finish();
+                    }
+                }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                    @Override
+                    public void execute(LuPromise.LuPromiseError error) {
+                        setResult(RESULT_CANCELED);
+                        finish();
+                    }
+                });
+            }
+        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+            @Override
+            public void execute(LuPromise.LuPromiseError error) {
+                Toast.makeText(CommandExecActivity.this, error.toString(), Toast.LENGTH_LONG).show();
+                setResult(RESULT_CANCELED);
+                finish();
+            }
+        });
+    }
+}

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

@@ -39,8 +39,9 @@ public abstract class CommandExecDialog {
                 .show();
     }
 
-    protected static void showLoadingDialog(final LuDataAccessConfigDbo config, final Context context, final CommandDbo command)
+    public static LuPromise<Boolean> showLoadingDialog(final LuDataAccessConfigDbo config, final Context context, final CommandDbo command)
     {
+        final LuPromise<Boolean> promise = new LuPromise<>();
         final ProgressDialog dlg = new ProgressDialog(context);
         dlg.setIndeterminate(true);
         dlg.setTitle(R.string.loading);
@@ -51,22 +52,49 @@ public abstract class CommandExecDialog {
             @Override
             public void execute(LuBoolDbo data) {
                 dlg.hide();
-                showEndDialog(context, context.getString(R.string.command_success, command.getName()));
+                showEndDialog(context, context.getString(R.string.command_success, command.getName()))
+                    .then(new LuPromise.LuConsumer<Boolean>() {
+                        @Override
+                        public void execute(Boolean data) {
+                            promise.resolve(null);
+                        }
+                    });
             }
         }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
             @Override
-            public void execute(LuPromise.LuPromiseError error) {
+            public void execute(final LuPromise.LuPromiseError error) {
                 dlg.hide();
-                showEndDialog(context, context.getString(R.string.error, error.toString()));
+                showEndDialog(context, context.getString(R.string.error, error.toString()))
+                        .then(new LuPromise.LuConsumer<Boolean>() {
+                            @Override
+                            public void execute(Boolean data) {
+                                promise.reject(error);
+                            }
+                        });
             }
         });
+        return promise;
     }
 
-    protected static void showEndDialog(Context context, String text)
+    protected static LuPromise<Boolean> showEndDialog(Context context, String text)
     {
+        final LuPromise<Boolean> promise = new LuPromise<>();
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setMessage(text);
-        builder.setPositiveButton(android.R.string.ok, null);
-        builder.show();
+        builder.setMessage(text)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        promise.resolve(null);
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        promise.resolve(null);
+                    }
+                })
+                .show();
+        return promise;
     }
 }

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

@@ -0,0 +1,46 @@
+package com.rthoni.camotion.ui.dialogs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+
+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;
+
+/**
+ * Created by robin on 12/10/15.
+ */
+public abstract class LocationPickerDialog {
+    public static LuPromise<LocationDbo> getLocation(Context context)
+    {
+        final LuPromise<LocationDbo> promise = new LuPromise<>();
+
+        final List<LocationDbo> locations = CamotionBusiness.getLocations(context);
+
+        String[] locationStrings = new String[locations.size()];
+        for (int i = 0; i < locations.size(); ++i) {
+            LocationDbo location = locations.get(i);
+            locationStrings[i] = location.getPseudoMail();
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(R.string.locations)
+                .setItems(locationStrings, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        promise.resolve(locations.get(which));
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        promise.reject(null);
+                    }
+                })
+        .show();
+        return promise;
+    }
+}

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.rthoni.camotion.ui.CommandExecActivity">
+
+</RelativeLayout>

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

@@ -5,6 +5,7 @@
     <string name="error">Error : %1$s</string>
 
     <string name="add_location_title">Add Camotion Account</string>
+    <string name="add_shortcut_title">Camotion - Shortcut</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>