fix merge conflict

Author: Vintache Jean

Colladia/app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/ColladiaTheme" >
-        android:screenOrientation="portrait" > <!-- disable auto-rotate -->
+         <!-- android:screenOrientation="portrait" disable auto-rotate -->
 
         <activity
             android:name=".LoginActivity"

Colladia/app/src/main/java/com/ia04nf28/colladia/DrawActivity.java

@@ -89,9 +89,6 @@ public void selectDrawerItem(MenuItem item)
         switch(item.getItemId())
         {
             case R.id.nav_home:
-                /*Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
-                startActivity(intent);*/
-                Manager.instance(getApplicationContext()).quitWorkspace();
                 finish();
                 break;
 
@@ -144,22 +141,7 @@ public boolean onOptionsItemSelected(MenuItem item)
         }
     }
 
-  /*  public void onBackPressed() {
-        super.onBackPressed();
-        Log.d(TAG, "onBackPressed");
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        if (drawer.isDrawerOpen(GravityCompat.START)) {
-            drawer.closeDrawer(GravityCompat.START);
-        } else {
-            super.onBackPressed();
-        }
-    }*/
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Manager.instance(getApplicationContext()).quitWorkspace();
-    }
 
     @Override
     public void onStateChange(Diagram currentDiagram) {
@@ -168,4 +150,18 @@ public void onStateChange(Diagram currentDiagram) {
             getSupportActionBar().setTitle(Manager.instance(getApplicationContext()).getCurrentDiagram().getName());
         }catch (Throwable e) {}
     }
+
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Manager.instance(getApplicationContext()).joinWorkspace();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Manager.instance(getApplicationContext()).quitWorkspace();
+    }
 }

Colladia/app/src/main/java/com/ia04nf28/colladia/DrawColladiaView.java

@@ -507,7 +507,6 @@ private void upTouch(float x, float y)
         switch(mode)
         {
             case INSERT:
-                //Manager.instance(applicationCtx).updatePositionElement(drawElem, iAbsolutePoint, mAbsolutePoint);
                 drawElem.set(iAbsolutePoint,mAbsolutePoint);
                 Manager.instance(applicationCtx).addElement(drawElem);
                 drawElem = null;

Colladia/app/src/main/java/com/ia04nf28/colladia/LoginActivity.java

@@ -103,7 +103,7 @@ public void onPropertyChanged(Observable sender, int propertyId) {
         updateColorPickerButton(color);
     }
 
-    @Override
+    /*@Override
     protected void onStop() {
         super.onStop();
 
@@ -120,7 +120,7 @@ protected void onStop() {
 
         // save edits
         editor.apply();
-    }
+    }*/
 
     /**
      * Attempts to connect.
@@ -224,8 +224,22 @@ public void onAnimationEnd(Animator animation) {
     }
 
     private void startDrawActivity() {
+
+        // get user
+        User user = Manager.instance(getApplicationContext()).getUser();
+        String url = Manager.instance(getApplicationContext()).getUrl();
+
+        // edit settings
+        SharedPreferences settings = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putString("login", user.getLogin());
+        editor.putString("url", url);
+        editor.putInt("color", user.getColor());
+
+        // save edits
+        editor.apply();
+
         Intent intent = new Intent(this, WorkspacesListActivity.class);
-        //Intent intent = new Intent(this, DrawActivity.class);
         startActivity(intent);
     }
 
@@ -254,5 +268,11 @@ private void showColorPickerDialog() {
     private void updateColorPickerButton(int color){
         mColorPickerButton.setBackgroundColor(color);
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Manager.instance(getApplicationContext()).getLogged().set(false);
+    }
 }
 

Colladia/app/src/main/java/com/ia04nf28/colladia/WorkspacesListActivity.java

@@ -166,15 +166,19 @@ public void onClick(DialogInterface di, int i) {
     }
 
     private void updateAdapter(List<String> list){
-        listView.setAdapter(new ArrayAdapter<String>(this,R.layout.list_workspaces,list));
+        listView.setAdapter(new ArrayAdapter<String>(this, R.layout.list_workspaces, list));
     }
 
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Manager.instance(getApplicationContext()).quitServer();
+    protected void onResume() {
+        super.onResume();
+        Manager.instance(getApplicationContext()).joinServer();
     }
 
-
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Manager.instance(getApplicationContext()).quitServer();
+    }
 }

Colladia/app/src/main/java/com/ia04nf28/colladia/model/Manager.java

@@ -152,6 +152,11 @@ public void login(User user, String url) {
         // TODO check url
         // TODO if url valid
 
+        joinServer();
+
+    }
+
+    public void joinServer(){
         if(requestTimer!=null) {
             requestTimer.cancel();
             requestTimer = new Timer();
@@ -160,24 +165,31 @@ public void login(User user, String url) {
         // end of if url valid
     }
 
-
-    public void joinWorkspace(){
-        requestTimerElements.schedule(createElementsTask(), 0, delayRequestElements);
-    }
-
-    public void quitWorkspace(){
-        requestTimerElements.cancel();
-        requestTimerElements = new Timer();
-        lastClock = "0";
-        currentDiagram = null;
+    public void joinWorkspace() {
+        if (getCurrentDiagram() != null) {
+            if (requestTimerElements != null) {
+                requestTimerElements.cancel();
+                requestTimerElements = new Timer();
+                lastClock = "0";
+            }
+            requestTimerElements.schedule(createElementsTask(), 0, delayRequestElements);
+        }
     }
 
     public void quitServer(){
-        logged.set(false);
-        requestTimer.cancel();
-        requestTimer = new Timer();
+        if(requestTimer!=null) {
+            requestTimer.cancel();
+            requestTimer = new Timer();
+        }
     }
 
+    public void quitWorkspace()     {
+        if(requestTimerElements!=null) {
+            requestTimerElements.cancel();
+            requestTimerElements = new Timer();
+            lastClock = "0";
+        }
+    }
 
     /**
      * Method that handle every response from the server
@@ -188,11 +200,6 @@ private void responseRequestHandler(String responseRequest){
             JSONObject mainObject = new JSONObject(responseRequest);
             if (mainObject.getString(STATUS_FIELD).equalsIgnoreCase(STATUS_OK)){
                 Log.d(TAG, "Request success "+responseRequest );
-                // if first response
-                if (!logged.get())
-                {
-                    logged.set(true);
-                }
                 if(mainObject.has(CLOCK_FIELD))
                     lastClock = mainObject.getString(CLOCK_FIELD);
 
@@ -306,7 +313,20 @@ private void requestDiagrams() {
         Requestator.instance(context).getDiagramsList(new Response.Listener<String>() {
             @Override
             public void onResponse(String s) {
-                responseRequestHandler(s);
+                try {
+                    JSONObject mainObject = new JSONObject(s);
+                    if (mainObject.getString(STATUS_FIELD).equalsIgnoreCase(STATUS_OK)) {
+                        if (!logged.get())
+                        {
+                            logged.set(true);
+                        }
+                        responseRequestHandler(s);
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+
             }
         });
     }