* Fixed string to c_str() issue in ForwardingManager

* Updated PhotoShare: add icons to menu
* Minor launch feedback fixes in JNI

Author: erimatnor

android/PhotoShare/src/org/haggle/PhotoShare/PhotoShare.java

@@ -8,6 +8,7 @@
 
 import android.app.AlertDialog;
 import android.app.Application;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.util.Log;
@@ -81,14 +82,27 @@ public int initHaggle() {
 			Log.d(PhotoShare.LOG_TAG, "Trying to spawn Haggle daemon");
 
 			if (!Handle.spawnDaemon(new LaunchCallback() {
-
+				ProgressDialog progress = null;
+				
 				public int callback(long milliseconds) {
 
 					Log.d(PhotoShare.LOG_TAG, "Spawning milliseconds..." + milliseconds);
 
 					if (milliseconds == 0) {
 						// Daemon launched
+					} else if (milliseconds == 2000) {
+						progress = ProgressDialog.show(pv, "",
+				        		"Launching Haggle...", true);
+					} else if (milliseconds == 10000) {
+						Log.d(PhotoShare.LOG_TAG, "Spawning failed, giving up");
+						
+						if (progress != null)
+							progress.dismiss();
+						return -1;
 					}
+
+					if (progress != null)
+						progress.dismiss();
 					return 0;
 				}
 			})) {

android/PhotoShare/src/org/haggle/PhotoShare/PhotoView.java

@@ -257,9 +257,9 @@ protected Dialog onCreateDialog(int id) {
     public boolean onCreateOptionsMenu(Menu menu) {
     	super.onCreateOptionsMenu(menu);
 
-        menu.add(0, MENU_TAKE_PICTURE, 0, R.string.menu_take_picture).setIcon(R.drawable.ic_camera_indicator_photo);
-        menu.add(0, MENU_INTERESTS, 0, R.string.menu_interests);
-        menu.add(0, MENU_SHUTDOWN_HAGGLE, 0, R.string.menu_shutdown_haggle);
+        menu.add(0, MENU_TAKE_PICTURE, 0, R.string.menu_take_picture).setIcon(android.R.drawable.ic_menu_camera);
+        menu.add(0, MENU_INTERESTS, 0, R.string.menu_interests).setIcon(android.R.drawable.ic_menu_search);
+        menu.add(0, MENU_SHUTDOWN_HAGGLE, 0, R.string.menu_shutdown_haggle).setIcon(android.R.drawable.ic_lock_power_off);
 
         return true;
 	}

src/hagglekernel/ForwardingManager.cpp

@@ -1317,7 +1317,7 @@ void ForwardingManager::onConfig(Metadata *m)
 					setForwardingModule(NULL);
 				} else {
 					// do not change forwarding module if name not known
-					HAGGLE_DBG("configured forwarding module <%s> not known. No change applied.", protocol); 
+					HAGGLE_DBG("configured forwarding module <%s> not known. No change applied.", protocol.c_str()); 
 				}
 			}			
 			if (forwardingModule) {

src/libhaggle/jni/native/org_haggle_Handle.c

@@ -780,7 +780,7 @@ static int spawn_daemon_callback(unsigned int milliseconds)
                 return -1;
         }
 
-        if (milliseconds == 0 || ret == 1) {
+        if (milliseconds == 0 || ret == 1 || ret == -1) {
                 (*env)->DeleteGlobalRef(env, spawn_object);
 		spawn_object = NULL;
         }