Fixed fragments to use arguments

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

@@ -14,11 +14,13 @@ 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;
+import com.rthoni.camotion.ui.fragments.CommandsFragment;
 
 import io.fabric.sdk.android.Fabric;
 
-public class AddCommandShortcutActivity extends Activity {
+public class AddCommandShortcutActivity extends Activity implements CommandsFragment.OnCommandClickedInterface {
+
+    private LocationDbo _currentLocation = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,7 +54,8 @@ public class AddCommandShortcutActivity extends Activity {
         dlg.loginFull(location).then(new LuPromise.LuConsumer<LuFullLoginDbo>() {
             @Override
             public void execute(LuFullLoginDbo loginDbo) {
-                showCommands(loginDbo, location);
+                _currentLocation = location;
+                showCommands(loginDbo);
             }
         }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
             @Override
@@ -63,22 +66,20 @@ public class AddCommandShortcutActivity extends Activity {
         });
     }
 
-    private void showCommands(final LuFullLoginDbo loginDbo, final LocationDbo location)
+    private void showCommands(final LuFullLoginDbo loginDbo)
     {
-        AbstractCommandsFragment fragment = new AbstractCommandsFragment() {
-            @Override
-            protected void onCommandClicked(CommandDbo command) {
-                addShortcut(location, command);
-            }
-        };
-        fragment.setCamotionDbo(loginDbo, location);
+        CommandsFragment fragment = new CommandsFragment();
+        Bundle args = new Bundle();
+        args.putString("CAMOTION_LOGIN_DBO", loginDbo.toString());
+        args.putString("CAMOTION_LOCATION_DBO", _currentLocation.toString());
+        fragment.setArguments(args);
         getFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
     }
 
-    private void addShortcut(LocationDbo location, CommandDbo command)
-    {
+    @Override
+    public void onCommandClicked(CommandDbo command) {
         Intent shortcutIntent = new Intent(this, CommandExecActivity.class);
-        shortcutIntent.putExtra("LOCATION_PSEUDO_MAIL", location.getPseudoMail());
+        shortcutIntent.putExtra("LOCATION_PSEUDO_MAIL", _currentLocation.getPseudoMail());
         shortcutIntent.putExtra("COMMAND", command.toString());
         Intent.ShortcutIconResource iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_command_bg);
 

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.provider.Settings;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -23,19 +22,21 @@ import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.business.LuRequest;
 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.LocationPickerDialog;
 import com.rthoni.camotion.ui.dialogs.LoginDialog;
+import com.rthoni.camotion.ui.fragments.CommandsFragment;
 import com.rthoni.camotion.ui.fragments.CamerasFragment;
 import com.rthoni.camotion.ui.fragments.CamotionFragment;
-import com.rthoni.camotion.ui.fragments.CommandsFragment;
 import com.rthoni.camotion.ui.fragments.SensorsFragment;
 
 import io.fabric.sdk.android.Fabric;
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
+        implements NavigationView.OnNavigationItemSelectedListener, CommandsFragment.OnCommandClickedInterface {
 
     private LuFullLoginDbo _fullLoginDbo = null;
     private LocationDbo _currentLocation = null;
@@ -212,7 +213,10 @@ public class MainActivity extends AppCompatActivity
         } */else {
             return;
         }
-        fragment.setCamotionDbo(_fullLoginDbo, _currentLocation);
+        Bundle args = new Bundle();
+        args.putString("CAMOTION_LOGIN_DBO", _fullLoginDbo.toString());
+        args.putString("CAMOTION_LOCATION_DBO", _currentLocation.toString());
+        fragment.setArguments(args);
         getFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
     }
 
@@ -247,4 +251,9 @@ public class MainActivity extends AppCompatActivity
     {
         super.onConfigurationChanged(newConfig);
     }
+
+    @Override
+    public void onCommandClicked(CommandDbo command) {
+        CommandExecDialog.showDialog(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), this, command);
+    }
 }

app/src/main/java/com/rthoni/camotion/ui/fragments/AbstractCommandsFragment.java

@@ -1,41 +0,0 @@
-package com.rthoni.camotion.ui.fragments;
-
-import com.luticate.utils.business.LuPromise;
-import com.luticate.utils.dbo.LuMultipleDbo;
-import com.rthoni.camotion.business.CommandsBusiness;
-import com.rthoni.camotion.dbo.CommandDbo;
-import com.rthoni.camotion.ui.views.CommandView;
-
-/**
- *
- * Created by robin on 11/29/15.
- */
-public abstract class AbstractCommandsFragment extends CamotionFragment<CommandDbo, CommandView> {
-
-    @Override
-    protected LuPromise<LuMultipleDbo<CommandDbo>> getLoadPagePromise(int page, int perPage, String query) {
-        return CommandsBusiness.getAll(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), page, perPage)
-                .map(new LuPromise.LuConverter<CommandDbo.MultipleCommandDbo, LuMultipleDbo<CommandDbo>>() {
-                    @Override
-                    public LuMultipleDbo<CommandDbo> convert(CommandDbo.MultipleCommandDbo data) {
-                        return data;
-                    }
-                });
-    }
-
-    @Override
-    protected CommandView getDboView(final CommandDbo command) {
-        CommandView commandView = new CommandView(getActivity());
-        commandView.setCamotionDbo(_fullLoginDbo, _currentLocation);
-        commandView.setCommand(command);
-        commandView.setOnClickedListener(new LuPromise.LuConsumer<CommandDbo>() {
-            @Override
-            public void execute(CommandDbo command) {
-                onCommandClicked(command);
-            }
-        });
-        return commandView;
-    }
-
-    protected abstract void onCommandClicked(CommandDbo command);
-}

app/src/main/java/com/rthoni/camotion/ui/fragments/CamotionFragment.java

@@ -1,5 +1,7 @@
 package com.rthoni.camotion.ui.fragments;
 
+import android.content.Context;
+import android.os.Bundle;
 import android.view.View;
 
 import com.luticate.auth.dbo.LuFullLoginDbo;
@@ -7,6 +9,8 @@ import com.luticate.utils.dbo.LuDbo;
 import com.luticate.utils.ui.fragments.ViewPaginationFragment;
 import com.rthoni.camotion.dbo.LocationDbo;
 
+import org.json.JSONException;
+
 /**
  * Created by robin on 12/3/15.
  */
@@ -14,9 +18,24 @@ public abstract class CamotionFragment<Dbo extends LuDbo, DboView extends View>
     protected LuFullLoginDbo _fullLoginDbo = null;
     protected LocationDbo _currentLocation = null;
 
-    public void setCamotionDbo(LuFullLoginDbo fullLoginDbo, LocationDbo currentLocation)
-    {
-        _fullLoginDbo = fullLoginDbo;
-        _currentLocation = currentLocation;
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        try {
+            _fullLoginDbo = new LuFullLoginDbo();
+            _fullLoginDbo.fromString(getArguments().getString("CAMOTION_LOGIN_DBO"));
+
+            _currentLocation = new LocationDbo();
+            _currentLocation.fromString(getArguments().getString("CAMOTION_LOCATION_DBO"));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        _fullLoginDbo = null;
+        _currentLocation = null;
     }
 }

app/src/main/java/com/rthoni/camotion/ui/fragments/CommandsFragment.java

@@ -1,16 +1,63 @@
 package com.rthoni.camotion.ui.fragments;
 
+import android.app.Activity;
+import android.content.Context;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuMultipleDbo;
+import com.rthoni.camotion.business.CommandsBusiness;
 import com.rthoni.camotion.dbo.CommandDbo;
-import com.rthoni.camotion.ui.dialogs.CommandExecDialog;
+import com.rthoni.camotion.ui.views.CommandView;
 
 /**
  *
  * Created by robin on 11/29/15.
  */
-public class CommandsFragment extends AbstractCommandsFragment {
+public class CommandsFragment extends CamotionFragment<CommandDbo, CommandView> {
+
+    public interface OnCommandClickedInterface {
+        void onCommandClicked(CommandDbo command);
+    }
+
+    private OnCommandClickedInterface onCommandClickedInterface;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        if (context instanceof Activity) {
+            onCommandClickedInterface = (OnCommandClickedInterface) context;
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        onCommandClickedInterface = null;
+    }
+
+    @Override
+    protected LuPromise<LuMultipleDbo<CommandDbo>> getLoadPagePromise(int page, int perPage, String query) {
+        return CommandsBusiness.getAll(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), page, perPage)
+                .map(new LuPromise.LuConverter<CommandDbo.MultipleCommandDbo, LuMultipleDbo<CommandDbo>>() {
+                    @Override
+                    public LuMultipleDbo<CommandDbo> convert(CommandDbo.MultipleCommandDbo data) {
+                        return data;
+                    }
+                });
+    }
 
     @Override
-    protected void onCommandClicked(CommandDbo command) {
-        CommandExecDialog.showDialog(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), getActivity(), command);
+    protected CommandView getDboView(final CommandDbo command) {
+        CommandView commandView = new CommandView(getActivity());
+        commandView.setCamotionDbo(_fullLoginDbo, _currentLocation);
+        commandView.setCommand(command);
+        commandView.setOnClickedListener(new LuPromise.LuConsumer<CommandDbo>() {
+            @Override
+            public void execute(CommandDbo command) {
+                onCommandClickedInterface.onCommandClicked(command);
+            }
+        });
+        return commandView;
     }
 }

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

@@ -53,9 +53,9 @@ public class LuFullLoginDbo extends LuDbo {
     public HashMap<String, Object> toArray() {
         HashMap<String, Object> array = new HashMap<>();
         array.put("LoginDbo", _loginDbo.toArray());
-        JSONArray permissions = new JSONArray();
+        List<HashMap<String, Object>> permissions = new Vector<>();
         for (LuPermissionDbo perm : _permissions) {
-            permissions.put(perm.toArray());
+            permissions.add(perm.toArray());
         }
         array.put("Permissions", permissions);
         return array;

luticateutils/src/main/java/com/luticate/utils/dbo/LuDbo.java

@@ -14,6 +14,12 @@ public abstract class LuDbo {
 
     public abstract HashMap<String, Object> toArray();
 
+    public void fromString(String data) throws JSONException
+    {
+        JSONObject json = new JSONObject(data);
+        fromJson(json);
+    }
+
     public JSONObject toJson()
     {
         return new JSONObject(toArray());