Add more properties for Android event callback

* fix: Add more properties to event for success callback

Add additional tests for Android
Update sentry-cocoa and KSCrash

Fixes #220

Author: HazAT

android/src/main/java/io/sentry/MapUtil.java

@@ -127,8 +127,6 @@ public static WritableMap toWritableMap(Map<String, Object> map) {
             } else if (value.getClass() != null && value.getClass().isArray()) {
                 writableMap.putArray((String) pair.getKey(), ArrayUtil.toWritableArray((Object[]) value));
             }
-
-            iterator.remove();
         }
 
         return writableMap;

android/src/main/java/io/sentry/RNSentryModule.java

@@ -19,12 +19,11 @@
 import com.facebook.react.bridge.WritableNativeMap;
 
 import java.util.ArrayDeque;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
@@ -108,6 +107,11 @@ public void onSuccess(Event event) {
                 WritableMap params = Arguments.createMap();
                 params.putString("event_id", event.getId().toString());
                 params.putString("level", event.getLevel().toString().toLowerCase());
+                params.putString("message", event.getMessage());
+                params.putString("release", event.getRelease());
+                params.putString("dist", event.getDist());
+                params.putMap("extra", MapUtil.toWritableMap(event.getExtra()));
+                params.putMap("tags", MapUtil.toWritableMap(Collections.<String, Object>unmodifiableMap(event.getTags())));
                 RNSentryEventEmitter.sendEvent(reactContext, RNSentryEventEmitter.SENTRY_EVENT_SENT_SUCCESSFULLY, params);
             }
         });

appium/Makefile

@@ -33,7 +33,7 @@ test-android: create-android-test-bundle new-demo-project copy-local-files-to-ex
 	fastlane aws_android_upload_and_run
 	ANDROID=1 ruby check_run_failues.rb
 
-local-android-test:
+local-android-test: create-android-test-bundle new-demo-project copy-local-files-to-example
 	fastlane build_android_for_device_farm
 	ANDROID=1 pytest -vv tests/test_android.py
 

appium/conftest.py

@@ -83,7 +83,7 @@ def default_capabilities():
     desired_caps['showIOSLog'] = True
     if not runs_on_aws():
         if os.environ.get('ANDROID') == '1':
-            desired_caps['app'] = os.path.abspath('example/android/app/build/outputs/apk/app-release-unsigned.apk')
+            desired_caps['app'] = os.path.abspath('example/android/app/build/outputs/apk/app-full-release-unsigned.apk')
             desired_caps['platformName'] = 'Android'
             desired_caps['deviceName'] = 'Android'
         else:

appium/tests/test_android.py

@@ -3,23 +3,30 @@
 
 from time import sleep
 
+
+def extractText(driver):
+    return driver.find_elements_by_xpath('//android.widget.EditText')[0].text
+
 def test_send_message(driver):
     driver.find_element_by_accessibility_id('send message').click()
 
     sleep(3)
 
-    value = driver.find_elements_by_xpath('//android.widget.EditText')[0].text
+    value = extractText(driver)
 
     assert value != None
     event = json.loads(value)
 
     assert event['event_id'] != None
     assert event['level'] == 'warning'
+    assert event['message'] == 'TEST message'
+    assert event['extra']['react']
+    assert event['tags']['react']
 
 def test_throw_error(driver):
     driver.find_element_by_accessibility_id('throw error').click()
     driver.relaunch_app()
-    value = driver.find_elements_by_xpath('//android.widget.EditText')[0].text
+    value = extractText(driver)
     # the crash should have been already sent
     assert value is None
 
@@ -28,10 +35,39 @@ def test_native_crash(driver):
     driver.find_element_by_accessibility_id('native crash').click()
     driver.relaunch_app()
     sleep(3)
-    value = driver.find_elements_by_xpath('//android.widget.EditText')[0].text
+    value = extractText(driver)
 
     assert value != None
     event = json.loads(value)
 
     assert event['event_id'] != None
     assert event['level'] == 'fatal'
+
+def test_version(driver):
+    driver.find_element_by_accessibility_id('set version').click()
+    driver.find_element_by_accessibility_id('send message').click()
+    sleep(3)
+    value = extractText(driver)
+    assert value != None
+    event = json.loads(value)
+    assert event['release'] == 'com.awesomeproject.full-1337'
+
+
+def test_release(driver):
+    driver.find_element_by_accessibility_id('set release').click()
+    driver.find_element_by_accessibility_id('send message').click()
+    sleep(3)
+    value = extractText(driver)
+    assert value != None
+    event = json.loads(value)
+    assert event['release'] == 'myversion'
+
+
+def test_dist(driver):
+    driver.find_element_by_accessibility_id('set dist').click()
+    driver.find_element_by_accessibility_id('send message').click()
+    sleep(3)
+    value = extractText(driver)
+    assert value != None
+    event = json.loads(value)
+    assert event['dist'] == '500'