Connection to server

Add URL helper & connect via setting hostname / port

Connection to server
Add URL helper & connect via setting hostname / port
florian staine
1 parent 7a4f791c
Showing 13 changed files with 156 additions and 122 deletions Show diff stats
.gitignore
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/misc.xml
.idea/modules.xml
.idea/runConfigurations.xml
.idea/vcs.xml
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/BaseActivity.java
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/network/URLSolver.java
app/src/main/res/layout/content_calibration.xml
app/src/main/res/values/strings.xml
app/src/main/res/xml/pref_general.xml
@@ -53,3 +53,5 @@ google-services.json
 freeline.py
 freeline/
 freeline_project_description.json
+
+\.idea/
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
 \ No newline at end of file
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/PositionningApp.iml" filepath="$PROJECT_DIR$/PositionningApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
 \ No newline at end of file
 package fr.utbm.lo53.p2017.positionningapp;
 import android.content.Intent;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-public class BaseActivity extends AppCompatActivity {
+import fr.utbm.lo53.p2017.positionningapp.network.URLSolver;
+
+public abstract class BaseActivity extends AppCompatActivity {
+
+    private URLSolver urlSolver;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String defaultHostname = getString(R.string.pref_default_hostname);
+        String defaultPort = getString(R.string.pref_default_port);
+        urlSolver = new URLSolver(PreferenceManager.getDefaultSharedPreferences(this), defaultHostname, defaultPort);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(getURLSolver());
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(getURLSolver());
+    }
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -40,4 +67,8 @@ public class BaseActivity extends AppCompatActivity {
         return true;
     }
+    public URLSolver getURLSolver() {
+        return urlSolver;
+    }
+
 }
@@ -18,9 +18,11 @@ import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
-import com.android.volley.toolbox.StringRequest;
+import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.Volley;
+import org.json.JSONObject;
+
 public class PositioningActivity extends BaseActivity {
     private static final String TAG = "PositioningActivity";
@@ -33,31 +35,35 @@ public class PositioningActivity extends BaseActivity {
     // Instantiate the RequestQueue.
     private RequestQueue queue;
-    private String url = "http://www.google.com";
+    private boolean isLocating = false;
     // Request a string response from the provided URL.
-    private StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
-            new Response.Listener<String>() {
-                @Override
-                public void onResponse(String response) {
-                    // Display the first 500 characters of the response string.
-                    textView.setText("Response is: "+ response.substring(0,500));
-                }
-            }, new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-            Log.d(TAG, error.getCause().toString());
-            textView.clearComposingText();
-        }
-    });
+    private JsonObjectRequest stringRequest;
     private final Handler handler = new Handler();
     private final Runnable runnable = new Runnable() {
         @Override
         public void run() {
-            // Add the request to the RequestQueue.
+            // Create request
+            stringRequest = new JsonObjectRequest(Request.Method.GET,
+                    getURLSolver().locateURL(),
+                    null,
+                    new Response.Listener<JSONObject>() {
+                        @Override
+                        public void onResponse(JSONObject response) {
+                            textView.setText("Response is: "+ response.toString().substring(0,500));
+                        }
+                    }, new Response.ErrorListener() {
+                @Override
+                public void onErrorResponse(VolleyError error) {
+                    textView.setText("Error: " + error.getMessage());
+                    Log.i(TAG, "Error during location request");
+                }
+            });
+            Log.v(TAG, "" + stringRequest);
             queue.add(stringRequest);
-            handler.postDelayed(this, 1000);
+
+            handler.postDelayed(runnable, 1000);
         }
     };
@@ -69,7 +75,7 @@ public class PositioningActivity extends BaseActivity {
         setSupportActionBar(toolbar);
         start_layout = (ConstraintLayout) findViewById(R.id.start_layout);
-        hideAnimation = createFadeOutAndHideAnimation();
+        initFadeOutAndHideAnimation();
         textView = (TextView) findViewById(R.id.ID_yolo);
@@ -77,9 +83,17 @@ public class PositioningActivity extends BaseActivity {
     }
     @Override
-    protected void onDestroy() {
+    protected void onPause() {
+        super.onPause();
         handler.removeCallbacks(runnable);
-        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (isLocating) {
+            handler.post(runnable);
+        }
     }
     @Override
@@ -91,11 +105,17 @@ public class PositioningActivity extends BaseActivity {
     }
     public void startLocating(View v) {
+        if (isLocating) {
+            return;
+        }
+
+        isLocating = true;
         start_layout.startAnimation(hideAnimation);
+
         handler.post(runnable);
     }
-    private Animation createFadeOutAndHideAnimation() {
+    private void initFadeOutAndHideAnimation() {
         ImageView hiding_image = (ImageView) findViewById(R.id.hiding_image);
         final float initial_alpha = hiding_image.getImageAlpha() / 255;
         Animation animation = new AlphaAnimation(initial_alpha, 0);
@@ -109,6 +129,6 @@ public class PositioningActivity extends BaseActivity {
             public void onAnimationRepeat(Animation animation) {}
             public void onAnimationStart(Animation animation) {}
         });
-        return animation;
+        hideAnimation = animation;
     }
 }
+package fr.utbm.lo53.p2017.positionningapp.network;
+
+
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.util.Log;
+
+public class URLSolver implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private static final String TAG = "URLSolver;";
+
+    private static final String HOSTNAME_KEY = "hostname";
+    private static final String PORT_KEY = "port";
+
+    private final String defaultHostname;
+    private final String defaultPort;
+
+    private String hostname;
+    private int port;
+
+    public URLSolver(SharedPreferences sharedPref, String defaultHostname, String defaultPort) {
+        this.defaultHostname = defaultHostname;
+        this.defaultPort = defaultPort;
+
+        updateHostname(sharedPref);
+        updatePort(sharedPref);
+    }
+
+    private void updateHostname(SharedPreferences sharedPref) {
+        hostname =  sharedPref.getString(HOSTNAME_KEY, defaultHostname);
+        Log.i(TAG, "Update host: " + hostname);
+    }
+
+    private void updatePort(SharedPreferences sharedPref) {
+        port = Integer.valueOf(sharedPref.getString(PORT_KEY, defaultPort));
+        Log.i(TAG, "Update port: " + port);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch (key) {
+            case HOSTNAME_KEY:  updateHostname(sharedPreferences); break;
+            case PORT_KEY:      updateHostname(sharedPreferences); break;
+        }
+    }
+
+    private Uri.Builder baseURL() {
+        Uri.Builder builder = new Uri.Builder();
+        return builder.scheme("http").encodedAuthority(hostname + ":" + port);
+    }
+
+    public String locateURL(/* TODO: mac ... */) {
+        Uri.Builder b = baseURL();
+        b.appendPath("positioning")
+                .appendPath("request")
+                .appendQueryParameter("mac", "TODO"); // TODO
+        return b.build().toString();
+    }
+
+    public String calibrateURL() {
+        Uri.Builder b = baseURL();
+        b.appendPath("calibration")
+                .appendPath("request");
+        return b.build().toString();
+    }
+}
@@ -12,9 +12,12 @@
         android:id="@+id/Map"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="50dp"
+        android:adjustViewBounds="true"
         android:paddingLeft="0dp"
         android:paddingTop="0dp"
         android:scaleType="fitXY"
@@ -22,9 +25,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/map"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        app:srcCompat="@drawable/map" />
     <ImageView
         android:id="@+id/MapMarker"
@@ -45,7 +46,7 @@
     <Button
         android:id="@+id/setPointButton"
         style="@style/Widget.AppCompat.Button"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
@@ -60,7 +61,7 @@
     <Button
         android:id="@+id/cancelButton"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
@@ -74,7 +75,7 @@
     <Button
         android:id="@+id/measureButton"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
@@ -84,5 +84,5 @@
     <string name="pref_default_hostname">127.0.0.1</string>
     <string name="pref_title_port">Port</string>
-    <string name="default_port">8080</string>
+    <string name="pref_default_port">8080</string>
 </resources>
@@ -35,14 +35,17 @@
         android:selectAllOnFocus="true"
         android:singleLine="true"
         android:title="@string/pref_title_hostname" />
+
     <EditTextPreference
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:defaultValue="@string/default_port"
+        android:defaultValue="@string/pref_default_port"
         android:key="port"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="@string/pref_title_port" />
+        android:title="@string/pref_title_port"
+        android:numeric="integer"
+        android:maxLength="5" />
 </PreferenceScreen>