commit 6b27fe83e60bd460f6809aa927917a77d7d6fcae parent e9cefb2923f1bc80635968f3b4d7f13dd8b67c72 Author: David Engel <david@absentmindedproductions.ca> Date: Wed, 20 Jan 2016 23:28:53 -0700 android: updated message protocols to use JSON, now capable of adding device, adding new lists, and leaving lists as well as getting list of lists. Next steps are local data storage and associating classes with UI elements. Diffstat:
19 files changed, 177 insertions(+), 133 deletions(-)
diff --git a/android/shlist/.idea/.name b/android/shlist/.idea/.name diff --git a/android/shlist/.idea/compiler.xml b/android/shlist/.idea/compiler.xml diff --git a/android/shlist/.idea/copyright/profiles_settings.xml b/android/shlist/.idea/copyright/profiles_settings.xml @@ -1,3 +1,3 @@ -<component name="CopyrightManager"> - <settings default="" /> +<component name="CopyrightManager"> + <settings default="" /> </component> \ No newline at end of file diff --git a/android/shlist/.idea/encodings.xml b/android/shlist/.idea/encodings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding"> + <file url="PROJECT" charset="UTF-8" /> + </component> +</project> +\ No newline at end of file diff --git a/android/shlist/.idea/gradle.xml b/android/shlist/.idea/gradle.xml @@ -5,8 +5,8 @@ <GradleProjectSettings> <option name="distributionType" value="LOCAL" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" /> - <option name="gradleJvm" value="1.8" /> + <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.8" /> + <option name="gradleJvm" value="1.7" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> diff --git a/android/shlist/.idea/inspectionProfiles/Project_Default.xml b/android/shlist/.idea/inspectionProfiles/Project_Default.xml @@ -1,12 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0" is_locked="false"> - <option name="myName" value="Project Default" /> - <option name="myLocal" value="false" /> - <inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" /> - <inspection_tool class="AndroidLintRtlCompat" enabled="false" level="ERROR" enabled_by_default="false" /> - <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false"> - <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" /> - <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" /> - </inspection_tool> - </profile> -</component> -\ No newline at end of file diff --git a/android/shlist/.idea/inspectionProfiles/profiles_settings.xml b/android/shlist/.idea/inspectionProfiles/profiles_settings.xml @@ -1,7 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <settings> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_PROFILE" value="true" /> - <version value="1.0" /> - </settings> -</component> -\ No newline at end of file diff --git a/android/shlist/.idea/misc.xml b/android/shlist/.idea/misc.xml @@ -3,6 +3,30 @@ <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="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> @@ -13,7 +37,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 23 Platform" project-jdk-type="Android SDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/android/shlist/.idea/modules.xml b/android/shlist/.idea/modules.xml diff --git a/android/shlist/.idea/runConfigurations.xml b/android/shlist/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ +<?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 diff --git a/android/shlist/.idea/vcs.xml b/android/shlist/.idea/vcs.xml diff --git a/android/shlist/app/app.iml b/android/shlist/app/app.iml @@ -12,10 +12,12 @@ <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> - <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" /> + <afterSyncTasks> + <task>generateDebugAndroidTestSources</task> + <task>generateDebugSources</task> + </afterSyncTasks> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> @@ -24,7 +26,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <exclude-output /> @@ -34,13 +36,13 @@ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> @@ -63,31 +65,26 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" /> - <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" /> + <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" /> </component> </module> \ No newline at end of file diff --git a/android/shlist/app/src/main/java/drsocto/shlist/HomeScreen.java b/android/shlist/app/src/main/java/drsocto/shlist/HomeScreen.java @@ -28,6 +28,10 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -85,8 +89,15 @@ public class HomeScreen extends ActionBarActivity { dbHelper.closeDB(); if (id == null) { - String message = phoneNum + "\0android"; - AsyncTask sndmt = new sendNewDeviceMessageTask().execute(message, "" + MsgTypes.DEVICE_ADD_TYPE); + JSONObject obj = new JSONObject(); + try { + obj.put("phone_number", "" + phoneNum); + obj.put("os", "android"); + } catch (JSONException e) { + Log.d("netman", "JSONException: " + e); + } + String message = obj.toString(); + AsyncTask sndmt = new sendNewDeviceMessageTask().execute(message, "" + MsgTypes.device_add); try { sndmt.get(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { @@ -148,7 +159,13 @@ public class HomeScreen extends ActionBarActivity { }); if (id != null) { - new sendGetListsMessageTask().execute(id, "" + MsgTypes.GET_LISTS_TYPE); + JSONObject obj = new JSONObject(); + try { + obj.put("device_id", "" + id); + new sendGetListsMessageTask().execute(obj.toString(), "" + MsgTypes.lists_get); + } catch (JSONException e) { + Log.d("netman", "JSON Exception: " + e); + } } @@ -195,11 +212,15 @@ public class HomeScreen extends ActionBarActivity { String list_entry = adapter1.getItem(position); Log.d("main", "Tried to leave list: " + list_entry); String list_entry_split[] = list_entry.split(":"); - String list_name = list_entry_split[0]; - String list_id = list_entry_split[1]; - String device_id = id; - String message = device_id + "\0" + list_id; - new sendLeaveListMessageTask().execute(message, "" + MsgTypes.LEAVE_LIST_TYPE); + JSONObject obj = new JSONObject(); + int num = Integer.parseInt(list_entry_split[1]); + try { + obj.put("device_id", "" + id); + obj.put("list_num", num); + } catch (JSONException e) { + Log.d("netman", "JSON Exception: " + e); + } + new sendLeaveListMessageTask().execute(obj.toString(), "" + MsgTypes.list_leave); return true; default: return super.onContextItemSelected(item); @@ -245,12 +266,21 @@ public class HomeScreen extends ActionBarActivity { public void addList(String name) { dbHelper.openOrCreateDB(); String device_id = dbHelper.getDeviceID(); + String message = ""; dbHelper.closeDB(); - String message = device_id + "\0" + name; - new sendNewListMessageTask().execute(message, "" + MsgTypes.ADD_LIST_TYPE); - // send pair to server - // get list id message - // create list item, add list item + try { + JSONObject list_obj = new JSONObject(); + list_obj.put("num", 0); + list_obj.put("name", name); + list_obj.put("date", System.currentTimeMillis() / 1000L); + JSONObject main_obj = new JSONObject(); + main_obj.put("device_id", device_id); + main_obj.put("list", list_obj); + message = main_obj.toString(); + } catch (JSONException e) { + Log.d("netman", "JSONException: " + e); + } + new sendNewListMessageTask().execute(message, "" + MsgTypes.list_add); } public void addListDialog() { @@ -329,14 +359,6 @@ public class HomeScreen extends ActionBarActivity { } @Override protected void onPostExecute(String result) { - /*result = result.substring(4); - String[] parts = result.split("\0"); - Log.d("NetMan", "List id: " + parts[0]); - Log.d("NetMan", "Alive: " + parts[1]); - Log.d("NetMan", "Leave List End"); - if (parts[1].equals("1")) { - list2.add(joinLeaveMessage); - }*/ list1.remove(joinLeavePosition); adapter1.notifyDataSetChanged(); adapter2.notifyDataSetChanged(); @@ -354,17 +376,20 @@ public class HomeScreen extends ActionBarActivity { } @Override protected void onPostExecute(String result) { - String lists[] = result.split("\n"); - for (int i = 0; i < lists.length; ++i) { - Log.d("netman", "List: " + lists[i]); - String list_split[] = lists[i].split("\0"); - if (list_split.length > 1) { - String list_name = list_split[1]; - list1.add(list_name + ":" + list_split[0]); + try { + JSONObject main_obj = new JSONObject(result); + int num = main_obj.getInt("num_lists"); + JSONArray lists_arr = main_obj.getJSONArray("lists"); + + for (int i = 0; i < num; ++i) { + list1.add(lists_arr.getJSONObject(i).getString("name") + ":" + lists_arr.getJSONObject(i).getString("num")); } + + cListsTV.setText("Current Lists (" + list1.size() + ")"); + adapter1.notifyDataSetChanged(); + } catch (JSONException e) { + Log.d("netman", "JSON Exception: " + e); } - cListsTV.setText("Current Lists (" + list1.size() + ")"); - adapter1.notifyDataSetChanged(); } } @@ -376,15 +401,20 @@ public class HomeScreen extends ActionBarActivity { } @Override protected void onPostExecute(String result) { - String results[] = result.split("\0"); - String list_id = results[0]; - String list_name = results[1]; - dbHelper.openOrCreateDB(); - dbHelper.addList(list_id, list_name); - dbHelper.closeDB(); - list1.add(list_name + ":" + list_id); - cListsTV.setText("Current Lists (" + list1.size() + ")"); - adapter1.notifyDataSetChanged(); + try { + JSONObject main_obj = new JSONObject(result); + JSONObject list_obj = main_obj.getJSONObject("list"); + String list_num = list_obj.getString("num"); + String list_name = list_obj.getString("name"); + dbHelper.openOrCreateDB(); + dbHelper.addList(list_num, list_name); + dbHelper.closeDB(); + list1.add(list_name + ":" + list_num); + cListsTV.setText("Current Lists (" + list1.size() + ")"); + adapter1.notifyDataSetChanged(); + } catch (JSONException e) { + Log.d("netman", "JSON Exception: " + e); + } } } } diff --git a/android/shlist/app/src/main/java/drsocto/shlist/MsgTypes.java b/android/shlist/app/src/main/java/drsocto/shlist/MsgTypes.java @@ -1,37 +1,19 @@ -/* generated Sun Jan 3 13:39:29 MST 2016 */ -package drsocto.shlist; +/* generated Wed, Jan 20, 2016 10:43:02 PM */ -import android.util.Log; +package drsocto.shlist; public final class MsgTypes { - public final static int protocol_version = 0; - - public final static int DEVICE_ADD_TYPE = 0; - public final static int DEVICE_OK_TYPE = 1; - public final static int ADD_FRIEND_TYPE = 2; - public final static int DELETE_FRIEND_TYPE = 3; - public final static int ADD_LIST_TYPE = 4; - public final static int JOIN_LIST_TYPE = 5; - public final static int LEAVE_LIST_TYPE = 6; - public final static int GET_LISTS_TYPE = 7; - public final static int GET_OTHER_LISTS_TYPE = 8; - public final static int GET_ITEMS_TYPE = 9; - public final static int ADD_ITEM_TYPE = 10; - - /* - device_add(0), - device_ok(1), - friend_add(2), - friend_delete(3), - list_add(4), - list_join(5), - list_leave(6), - lists_get(7), - lists_get_other(8), - list_items_get(9), - list_item_add(10) - */ - + public final static int protocol_version = 0; -} -\ No newline at end of file + public final static int device_add = 0; + public final static int friend_add = 1; + public final static int friend_delete = 2; + public final static int list_add = 3; + public final static int list_join = 4; + public final static int list_leave = 5; + public final static int lists_get = 6; + public final static int lists_get_other = 7; + public final static int list_items_get = 8; + public final static int list_item_add = 9; +} diff --git a/android/shlist/app/src/main/java/drsocto/shlist/NetMan.java b/android/shlist/app/src/main/java/drsocto/shlist/NetMan.java @@ -2,8 +2,12 @@ package drsocto.shlist; import android.content.Context; import android.os.AsyncTask; +import android.util.JsonReader; import android.util.Log; +import org.json.JSONException; +import org.json.JSONObject; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -106,22 +110,31 @@ public class NetMan { Log.d("netman", "Response: " + response_str); + if (!response_str.isEmpty()) { - int first_null = response_str.indexOf("\0"); - String err_code = response_str.substring(0, first_null); - String payload = response_str.substring(first_null + 1); - if (err_code.compareTo("err") != 0) { - Log.d("netman", "Payload: " + payload); - switch (mType) { - case MsgTypes.DEVICE_ADD_TYPE: - return payload; - case MsgTypes.ADD_LIST_TYPE: - return payload; - case MsgTypes.GET_LISTS_TYPE: - return payload; + JSONObject obj; + String status; + try { + obj = new JSONObject(response_str); + status = obj.getString("status"); + Log.d("netman", "Parsed JSON, status: " + status); + if (status.equalsIgnoreCase("ok")) { + switch (mType) { + case MsgTypes.device_add: + closeSocket(); + return obj.getString("device_id"); + case MsgTypes.list_add: + closeSocket(); + return obj.toString(); + case MsgTypes.lists_get: + closeSocket(); + return obj.toString(); + } + } else { + Log.d("netman", "Error:" + obj.toString()); } - } else { - Log.d("netman", "Error: " + payload); + } catch (JSONException e) { + Log.d("netman", "JSONException: " + e); } } else { Log.d("netman", "Error: empty payload"); diff --git a/android/shlist/build.gradle b/android/shlist/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/shlist/shlist.iml b/android/shlist/shlist.iml @@ -8,7 +8,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> diff --git a/server/msgs.pl b/server/msgs.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# generated Fri Jan 8 20:52:35 MST 2016 +# generated Wed, Jan 20, 2016 10:43:02 PM use strict; use warnings; diff --git a/server/tests/msgs.pl b/server/tests/msgs.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# generated Fri Jan 8 20:52:35 MST 2016 +# generated Wed, Jan 20, 2016 10:43:02 PM use strict; use warnings;