Commented code that was causing NullPointer Exception crashes

Author: Ehab Abdou

build.properties ant.properties

@@ -1,40 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="WebSocket" default="help">
+<project name="ACTIVITY_ENTRY_NAME" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
     <property file="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
          source.dir
              The name of the source directory. Default is 'src'.
          out.dir
              The name of the output directory. Default is 'bin'.
 
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
+    <loadproperties srcFile="project.properties" />
 
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
 
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
@@ -45,35 +54,32 @@
     <target name="-pre-compile">
     </target>
 
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
     <target name="-post-compile">
     </target>
 -->
 
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
+    <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <setup> task.
+               <import> task.
              - customize it to your needs.
-         - Customize the whole script.
+         - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
+               into this file, replacing the <import> task.
              - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

build.xml

@@ -7,4 +7,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/Users/ukenco-op/android-sdk-mac_x86
+sdk.dir=/Applications/android-sdk-macosx

local.properties

@@ -669,24 +669,26 @@ private void _readHandshake(byte[] handShakeBody) throws IOException, NoSuchAlgo
 		this.handshakeComplete = true;
 		boolean isConnectionReady = true;
 
-		if (this.draft == WebSocket.Draft.DRAFT76) {
-			if (handShakeBody == null) {
-				isConnectionReady = true;
-			}
-			byte[] challenge = new byte[] { (byte) (this.number1 >> 24),
-					(byte) ((this.number1 << 8) >> 24), (byte) ((this.number1 << 16) >> 24),
-					(byte) ((this.number1 << 24) >> 24), (byte) (this.number2 >> 24),
-					(byte) ((this.number2 << 8) >> 24), (byte) ((this.number2 << 16) >> 24),
-					(byte) ((this.number2 << 24) >> 24), this.key3[0], this.key3[1], this.key3[2],
-					this.key3[3], this.key3[4], this.key3[5], this.key3[6], this.key3[7] };
-			MessageDigest md5 = MessageDigest.getInstance("MD5");
-			byte[] expected = md5.digest(challenge);
-			for (int i = 0; i < handShakeBody.length; i++) {
-				if (expected[i] != handShakeBody[i]) {
-					isConnectionReady = true;
-				}
-			}
-		}
+		//TODO: Figure out a better way to fix this.
+		//Commented because it was causing a NullPointerException and because the code didn't seem to affect isConnectionReady
+//		if (this.draft == WebSocket.Draft.DRAFT76) {
+//			if (handShakeBody == null) {
+//				isConnectionReady = true;
+//			}
+//			byte[] challenge = new byte[] { (byte) (this.number1 >> 24),
+//					(byte) ((this.number1 << 8) >> 24), (byte) ((this.number1 << 16) >> 24),
+//					(byte) ((this.number1 << 24) >> 24), (byte) (this.number2 >> 24),
+//					(byte) ((this.number2 << 8) >> 24), (byte) ((this.number2 << 16) >> 24),
+//					(byte) ((this.number2 << 24) >> 24), this.key3[0], this.key3[1], this.key3[2],
+//					this.key3[3], this.key3[4], this.key3[5], this.key3[6], this.key3[7] };
+//			MessageDigest md5 = MessageDigest.getInstance("MD5");
+//			byte[] expected = md5.digest(challenge);
+//			for (int i = 0; i < handShakeBody.length; i++) {
+//				if (expected[i] != handShakeBody[i]) {
+//					isConnectionReady = true;
+//				}
+//			}
+//		}
 
 		if (isConnectionReady) {
 			this.readyState = WEBSOCKET_STATE_OPEN;