Merge branch 'android' of git://192.168.21.75/lightning into android

serp256 · Sep 11, 2012 · 9b311ea · 9b311ea
2 parents 8108159 + ce1ff13
commit 9b311ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/Lightning.ml b/src/Lightning.ml
@@ -107,11 +107,11 @@ ELSE
 IFDEF ANDROID THEN 
 external addExceptionInfo: string -> unit = "ml_addExceptionInfo";
 external setSupportEmail: string -> unit = "ml_setSupportEmail";
-ENDIF;
-
+ELSE
 value addExceptionInfo (_:string) = ();
 value setSupportEmail (_:string) = ();
 ENDIF;
+ENDIF;
 
 IFDEF ANDROID THEN
 

diff --git a/src/android/java/src/ru/redspell/lightning/LightView.java b/src/android/java/src/ru/redspell/lightning/LightView.java
@@ -442,11 +442,14 @@ public void openURL(String url){
 	}
 
   private String supportEmail = "mail@redspell.ru";
-	public void setSupportEmail(String d){ supportEmail = d; }
+	public void mlSetSupportEmail(String d){ supportEmail = d; }
 
-	public void addExceptionInfo(String d) {
-    //openURL("mailto:".concat(supportEmail).concat("?subject=test&body=wtf"));
-	}
+  private String additionalExceptionInfo = "\n";
+  public void mlAddExceptionInfo(String d) {
+		additionalExceptionInfo += d;
+		Log.d("LIGHTNING", "additionalExceptionInfo now is" + additionalExceptionInfo + '\n');
+		//openURL("mailto:".concat(supportEmail).concat("?subject=test&body=wtf"));
+  }
 
 	public void mlUncaughtException(String exn,String[] bt) {
 		Context c = getContext();
@@ -464,6 +467,7 @@ public void mlUncaughtException(String exn,String[] bt) {
 		for (String b : bt) {
 			body.append(b);body.append('\n');
 		};
+		body.append(additionalExceptionInfo);
 		uri.append("&body=" + Uri.encode(body.toString()));
 		Log.d("LIGHTNING","URI: " + uri.toString());
 		Intent sendIntent = new Intent(Intent.ACTION_VIEW,Uri.parse(uri.toString ()));
@@ -642,4 +646,4 @@ public void curlExternalLoaderError(int req, int errCode, int errMes) {
 		Log.d("LIGHTNING", "curlExternalLoaderError " + errCode + " " + errMes);
 		queueEvent(new CurlExternErrorCallbackRunnable(req, errCode, errMes));
 	}
-}
+}
diff --git a/src/android/mlwrapper_android.c b/src/android/mlwrapper_android.c
@@ -994,7 +994,7 @@ void ml_addExceptionInfo (value info){
 
 void ml_setSupportEmail (value d){
   JNIEnv *env;
-	DEBUG("set support email");
+	DEBUG("DDD: set support email");
 	(*gJavaVM)->GetEnv(gJavaVM, (void **)&env, JNI_VERSION_1_4);
 
 	char* cd = String_val(d);