Merge branch 'master' of https://github.com/nicoring/HelperNetAndroid

Conflicts:
	index.android.js

Author: mischkew

android/.gradle/2.4/taskArtifacts/cache.properties

@@ -24,7 +24,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.0'
-    compile 'com.facebook.react:react-native:0.11.+'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.facebook.react:react-native:0.13.+'
     compile 'ch.uepaa.p2p:p2pkit-android:1.0.3'
 }

android/.gradle/2.4/taskArtifacts/cache.properties.lock

@@ -89,6 +89,15 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
         return super.onKeyUp(keyCode, event);
     }
 
+    @Override
+    public void onBackPressed() {
+      if (mReactInstanceManager != null) {
+        mReactInstanceManager.onBackPressed();
+      } else {
+        super.onBackPressed();
+      }
+    }
+
     @Override
     public void invokeDefaultOnBackPressed() {
       super.onBackPressed();

android/.gradle/2.4/taskArtifacts/fileHashes.bin

@@ -186,9 +186,10 @@ private void handleMessage(String message, String id) {
                 mainActivity.getEventEmitter().emitLocation(lat, lng, id, mainActivity.getReactContext());
             } else if (prefix.equals("OK")) {
                 Log.d(TAG, "standard message");
-                pushNotification(Topic.MISC, "OK");
+//                pushNotification(Topic.MISC, "OK");
             } else {
-                throw new IllegalArgumentException("unsupported prefix");
+//                throw new IllegalArgumentException("unsupported prefix");
+                Log.e(TAG, "unsupported prefix: " + prefix);
             }
         }
     }

android/.gradle/2.4/taskArtifacts/fileSnapshots.bin

@@ -20,28 +20,31 @@ var {
   SwitchAndroid,
   AsyncStorage,
   Image,
-  TouchableOpacity
-} = React
+  TouchableOpacity,
+  BackAndroid
+} = React;
+
+
+const initialState = {
+  enabled: true,
+  number: "+491736353009",
+  callEmergencyAutomatically: false,
+  isEnabled: true,
+  emergencyText: 'Please help me I have an emergency!',
+  aroundCount: 0,
+  emergency: false,
+  receivedEmergency: false,
+  receivedEmergencyText: '',
+  location: {},
+  showSettings: false
+};
 
 var HelperNet = React.createClass({
 
   mixins: [Subscribable.Mixin],
 
   getInitialState() {
-    return {
-      counter: 0,
-      enabled: true,
-      number: "+491736353009",
-      callEmergencyAutomatically: false,
-      isEnabled: true,
-      emergencyText: 'Please help me I have an emergency!',
-      aroundCount: 0,
-      emergency: false,
-      receivedEmergency: true,
-      receivedEmergencyText: '',
-      location: {},
-      showSettings: false
-    }
+    return initialState;
   },
 
   componentWillMount() {
@@ -59,22 +62,29 @@ var HelperNet = React.createClass({
 
     this.addListenerOn(RCTDeviceEventEmitter,
                    'location',
-                   this.handleLocationReceived)
+                   this.handleLocationReceived);
+
+    BackAndroid.addEventListener('hardwareBackPress', () => {
+      if (this.state.showSettings) {
+        this.hideSettings()
+        return true;
+      }
+      return false;
+    });
   },
 
   componentDidMount() {
     _.forEach(_.keys(this.state), (key) => {
       AsyncStorage.getItem(key)
-        .then((value) => this.setState({key: value}))
-    })
+        .then((value) => {console.log("load key, value: ", key, value); this.setState({key: value})})
+    });
   },
 
   componentDidUpdate(prevProps, prevState) {
     _.forIn(this.state, (value, key) => {
-      if (value != null && key != null && value != prevState[key]) {
-        console.log(key, value)
-        // TODO: why does async storage break?
-        // AsyncStorage.setItem(key, value)
+      if (value != null && key != null && value != initialState[key] && value != prevState[key]) {
+        console.log("set key, value: ", key, value);
+        AsyncStorage.setItem(key, value);
       }
     })
   },
@@ -110,11 +120,10 @@ var HelperNet = React.createClass({
 
   sendMessage() {
     // this.getLocation().then((location) => {
-    //   const {latitude, longitude} = location.coords
-    //   NativeModules.P2PKit.setMessage(`no${this.state.emergencyText}|lo${latitude},${longitude}`)
-    // })
-    NativeModules.P2PKit.setMessage(`NO${this.state.emergencyText}|lo47.3897774,8.5164106`)
-    // this.setState({counter: this.state.counter + 1})
+    //   const {latitude, longitude} = location.coords;
+    //   NativeModules.P2PKit.setMessage(`no${this.state.emergencyText}|lo${latitude},${longitude}`);
+    // });
+    NativeModules.P2PKit.setMessage(`NO${this.state.emergencyText}|lo47.3897774,8.5164106`);
   },
 
   resetMessage() {
@@ -160,6 +169,11 @@ var HelperNet = React.createClass({
     this.setState({receivedEmergency: false})
   },
 
+  accept() {
+    this.directTo();
+    NativeModules.P2PKit.setMessage(`OT`);
+  },
+
   render() {
 
     const settings = (
@@ -213,7 +227,7 @@ var HelperNet = React.createClass({
 
           <View style={styles.aroundCountContainer}>
             <Text style={styles.copyrightText}>
-              &copy 2015 Nerdish by Nature
+              &copy; 2015 Nerdish by Nature
             </Text>
           </View>
         </ScrollView>
@@ -229,7 +243,7 @@ var HelperNet = React.createClass({
         <View style={styles.buttonGroup}>
           <TouchableHighlight
             style={styles.emergencyReceivedButton}
-            onPress={this.directTo}
+            onPress={this.accept}
             underlayColor='#ff0000'>
             <Text style={styles.emergencyReceivedButtonText}>Route there</Text>
           </TouchableHighlight>

android/.gradle/2.4/taskArtifacts/outputFileStates.bin

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "lodash": "^3.10.1",
-    "react-native": "^0.11.4",
+    "react-native": "^0.13.0-rc",
     "redux": "^3.0.2",
     "redux-actions": "^0.8.0"
   }