Merge pull request #1524 from akallabeth/android_debug_settings

Add debug settings menu for android

Menu needs to be activated with cmake with -DWITH_ANDROID_DEBUG_MENU=ON

client/Android/FreeRDPCore/CMakeLists.txt

@@ -28,6 +28,14 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/project.properties.cmake
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ant.properties.cmake
 	${CMAKE_CURRENT_BINARY_DIR}/ant.properties @ONLY)
 
+# Generate a Java class with static members set to the CMake
+# configuration properties.
+set(JAVA_CFG "src/com/freerdp/freerdpcore/utils/BuildConfiguration.java")
+set(JAVA_CFG_OUT "${CMAKE_CURRENT_BINARY_DIR}/${JAVA_CFG}")
+set(JAVA_CFG_IN "${CMAKE_CURRENT_SOURCE_DIR}/${JAVA_CFG}.in")
+
+CONFIGURE_FILE(${JAVA_CFG_IN} ${JAVA_CFG_OUT})
+
 file(COPY res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 if (ANDROID_SDK)

client/Android/FreeRDPCore/res/layout/bookmark_list_item.xml

@@ -22,6 +22,7 @@
     android:layout_height="wrap_content">
 
     <ImageView android:id="@+id/bookmark_icon1"
+        android:contentDescription="@+id/bookmark_icon1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
@@ -46,6 +47,7 @@
 		 />
 
     <ImageView android:id="@+id/bookmark_icon2"
+        android:contentDescription="@+id/bookmark_icon2"
         android:layout_marginTop="9dip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

client/Android/FreeRDPCore/res/layout/session_list_item.xml

@@ -23,6 +23,7 @@
 
 	<ImageView
 		android:id="@+id/session_screenshot"
+		android:contentDescription="@+id/session_screenshot"
 		android:layout_width="64dp"
 		android:layout_height="48dp"
 		android:scaleType="fitXY"
@@ -51,6 +52,7 @@
 
 	<ImageButton
 		android:id="@+id/session_disconnect"
+		android:contentDescription="@+id/session_disconnect"
 	    android:focusable="false"
 	    android:focusableInTouchMode="false"
 		android:layout_width="wrap_content"

client/Android/FreeRDPCore/res/values/strings.xml

@@ -32,8 +32,8 @@
     <!-- List placeholder labels -->
     <string name="list_placeholder_login">Login</string>
     <string name="list_placeholder_no_servers">No Servers</string>
-    <string name="list_placeholder_connecting">Connecting ...</string>
-    <string name="list_placeholder_disconnecting">Disconnecting ...</string>
+    <string name="list_placeholder_connecting">Connecting &#8230;</string>
+    <string name="list_placeholder_disconnecting">Disconnecting &#8230;</string>
     <string name="list_placeholder_connection_error">Connection Lost</string>
     <string name="list_placeholder_wrong_password">Wrong Password</string>
     <string name="list_placeholder_invalid_username">Invalid Username</string>
@@ -178,8 +178,8 @@
     <string name="dlg_title_credentials">Please enter your credentials</string>
     <string name="dlg_title_create_shortcut">Create Shortcut</string>
     <string name="dlg_msg_create_shortcut">Shortcut name:</string>
-    <string name="dlg_msg_connecting">Connecting ...</string>
-    <string name="dlg_msg_logging_in">Logging in ...</string>
+    <string name="dlg_msg_connecting">Connecting &#8230;</string>
+    <string name="dlg_msg_logging_in">Logging in &#8230;</string>
     <string name="dlg_title_about">About aFreeRDP</string>
     <string name="dlg_msg_about">Version: %1$s\n\u00A9 2012 Thinstuff Technologies GmbH</string>
     <string name="dlg_title_create_bookmark_after_qc">Save Connection Settings?</string>
@@ -191,4 +191,6 @@
     <string name="dlg_msg_exit">Are you sure you want to exit the application?</string>
     <string name="dlg_title_clear_cert_cache">Delete Certificates?</string>
     <string name="dlg_msg_clear_cert_cache">Are you sure you want to delete all your cached Certificates?</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
 </resources>

client/Android/FreeRDPCore/res/xml/bookmark_settings.xml

@@ -26,7 +26,9 @@
         </PreferenceScreen>
     </PreferenceCategory>
     
-    <PreferenceCategory android:title="@string/settings_cat_settings">
+		<PreferenceCategory
+			android:key="category.settings"
+			android:title="@string/settings_cat_settings">
 
         <PreferenceScreen android:key="bookmark.screen" android:title="@string/settings_screen">
         	<intent android:action="android.intent.action.VIEW" 
@@ -49,6 +51,13 @@
            		android:data="preferences://advanced_settings" />
         </PreferenceScreen>
     
-    </PreferenceCategory>
+    	<PreferenceScreen android:key="bookmark.debug" android:title="@string/settings_debug">
+        	<intent android:action="android.intent.action.VIEW" 
+           		android:targetPackage="*" 
+           		android:targetClass="com.freerdp.freerdpcore.presentation.BookmarkActivity" 
+           		android:data="preferences://debug_settings" />
+        </PreferenceScreen>
+        
+        </PreferenceCategory>
 
 </PreferenceScreen>

client/Android/FreeRDPCore/res/xml/debug_settings.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+/*
+	Debug Settings Layout
+
+	Copyright 2013 Thinstuff Technologies GmbH
+	Copyright 2013 Armin Novak <anovak@thinstuff.at>
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+		http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:freerdp="http://schemas.android.com/apk/res-auto">
+        <PreferenceCategory android:title="@string/settings_debug">
+	        <com.freerdp.freerdpcore.utils.IntEditTextPreference
+	            android:key="bookmark.debug_level"
+	            android:title="@string/debug_level"
+	            android:summary="Debug level, 0 to disable."
+	            android:numeric="integer"
+	            android:inputType="number"
+	            freerdp:bounds_min="0"
+	            freerdp:bounds_max="10"
+	            freerdp:bounds_default="0" />            
+        </PreferenceCategory>
+</PreferenceScreen>

client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java

@@ -5,27 +5,27 @@
 
    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
    If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+ */
 
 package com.freerdp.freerdpcore.domain;
 
+import java.util.Locale;
+
 import com.freerdp.freerdpcore.application.GlobalApp;
 
 import android.content.SharedPreferences;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-public class BookmarkBase implements Parcelable, Cloneable
-{
+public class BookmarkBase implements Parcelable, Cloneable {
 	public static final int TYPE_INVALID = -1;
 	public static final int TYPE_MANUAL = 1;
 	public static final int TYPE_QUICKCONNECT = 2;
 	public static final int TYPE_PLACEHOLDER = 3;
 	public static final int TYPE_CUSTOM_BASE = 1000;
-	
+
 	// performance flags
-	public static class PerformanceFlags implements Parcelable
-	{
+	public static class PerformanceFlags implements Parcelable {
 		private boolean remotefx;
 		private boolean wallpaper;
 		private boolean theming;
@@ -33,7 +33,7 @@ public class BookmarkBase implements Parcelable, Cloneable
 		private boolean menuAnimations;
 		private boolean fontSmoothing;
 		private boolean desktopComposition;
-	
+
 		public PerformanceFlags() {
 			remotefx = false;
 			wallpaper = false;
@@ -43,13 +43,13 @@ public class BookmarkBase implements Parcelable, Cloneable
 			fontSmoothing = false;
 			desktopComposition = false;
 		}
-		
+
 		public PerformanceFlags(Parcel parcel) {
 			remotefx = (parcel.readInt() == 1) ? true : false;
-			wallpaper = (parcel.readInt() == 1) ? true : false;			
-			theming = (parcel.readInt() == 1) ? true : false;			
-			fullWindowDrag = (parcel.readInt() == 1) ? true : false;			
-			menuAnimations = (parcel.readInt() == 1) ? true : false;			
+			wallpaper = (parcel.readInt() == 1) ? true : false;
+			theming = (parcel.readInt() == 1) ? true : false;
+			fullWindowDrag = (parcel.readInt() == 1) ? true : false;
+			menuAnimations = (parcel.readInt() == 1) ? true : false;
 			fontSmoothing = (parcel.readInt() == 1) ? true : false;
 			desktopComposition = (parcel.readInt() == 1) ? true : false;
 		}
@@ -57,7 +57,7 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public boolean getRemoteFX() {
 			return remotefx;
 		}
-		
+
 		public void setRemoteFX(boolean remotefx) {
 			this.remotefx = remotefx;
 		}
@@ -65,15 +65,15 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public boolean getWallpaper() {
 			return wallpaper;
 		}
-		
+
 		public void setWallpaper(boolean wallpaper) {
 			this.wallpaper = wallpaper;
 		}
-	
+
 		public boolean getTheming() {
 			return theming;
 		}
-		
+
 		public void setTheming(boolean theming) {
 			this.theming = theming;
 		}
@@ -81,7 +81,7 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public boolean getFullWindowDrag() {
 			return fullWindowDrag;
 		}
-		
+
 		public void setFullWindowDrag(boolean fullWindowDrag) {
 			this.fullWindowDrag = fullWindowDrag;
 		}
@@ -89,7 +89,7 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public boolean getMenuAnimations() {
 			return menuAnimations;
 		}
-		
+
 		public void setMenuAnimations(boolean menuAnimations) {
 			this.menuAnimations = menuAnimations;
 		}
@@ -97,21 +97,20 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public boolean getFontSmoothing() {
 			return fontSmoothing;
 		}
-		
+
 		public void setFontSmoothing(boolean fontSmoothing) {
 			this.fontSmoothing = fontSmoothing;
 		}
-		
+
 		public boolean getDesktopComposition() {
 			return desktopComposition;
 		}
-		
+
 		public void setDesktopComposition(boolean desktopComposition) {
 			this.desktopComposition = desktopComposition;
 		}
 
-		public static final Parcelable.Creator<PerformanceFlags> CREATOR = new Parcelable.Creator<PerformanceFlags>()
-		{
+		public static final Parcelable.Creator<PerformanceFlags> CREATOR = new Parcelable.Creator<PerformanceFlags>() {
 			public PerformanceFlags createFromParcel(Parcel in) {
 				return new PerformanceFlags(in);
 			}
@@ -128,26 +127,24 @@ public class BookmarkBase implements Parcelable, Cloneable
 		}
 
 		@Override
-		public void writeToParcel(Parcel out, int flags)
-		{
+		public void writeToParcel(Parcel out, int flags) {
 			out.writeInt(remotefx ? 1 : 0);
-			out.writeInt(wallpaper ? 1 : 0);		
-			out.writeInt(theming ? 1 : 0);		
-			out.writeInt(fullWindowDrag ? 1 : 0);		
-			out.writeInt(menuAnimations ? 1 : 0);		
+			out.writeInt(wallpaper ? 1 : 0);
+			out.writeInt(theming ? 1 : 0);
+			out.writeInt(fullWindowDrag ? 1 : 0);
+			out.writeInt(menuAnimations ? 1 : 0);
 			out.writeInt(fontSmoothing ? 1 : 0);
 			out.writeInt(desktopComposition ? 1 : 0);
-		}		
+		}
 	}
 
 	// Screen Settings class
-	public static class ScreenSettings implements Parcelable
-	{
+	public static class ScreenSettings implements Parcelable {
 		public static final int FITSCREEN = -2;
 		public static final int AUTOMATIC = -1;
 		public static final int CUSTOM = 0;
 		public static final int PREDEFINED = 1;
-		
+
 		private int resolution;
 		private int colors;
 		private int width;
@@ -163,67 +160,58 @@ public class BookmarkBase implements Parcelable, Cloneable
 			width = parcel.readInt();
 			height = parcel.readInt();
 		}
-				
+
 		private void init() {
 			resolution = AUTOMATIC;
 			colors = 16;
 			width = 0;
 			height = 0;
 		}
-		
-		public void setResolution(int resolution)
-		{
+
+		public void setResolution(int resolution) {
 			this.resolution = resolution;
-			
+
 			if (resolution == AUTOMATIC || resolution == FITSCREEN) {
 				width = 0;
 				height = 0;
 			}
 		}
-		
-		public void setResolution(String resolution, int width, int height)
-		{
+
+		public void setResolution(String resolution, int width, int height) {
 			if (resolution.contains("x")) {
 				String[] dimensions = resolution.split("x");
 				this.width = Integer.valueOf(dimensions[0]);
 				this.height = Integer.valueOf(dimensions[1]);
 				this.resolution = PREDEFINED;
-			}
-			else if (resolution.equalsIgnoreCase("custom"))
-			{
-				this.width = width;				
-				this.height = height;				
+			} else if (resolution.equalsIgnoreCase("custom")) {
+				this.width = width;
+				this.height = height;
 				this.resolution = CUSTOM;
-			}
-			else if (resolution.equalsIgnoreCase("fitscreen"))
-			{
+			} else if (resolution.equalsIgnoreCase("fitscreen")) {
 				this.width = this.height = 0;
 				this.resolution = FITSCREEN;
-			}
-			else
-			{
+			} else {
 				this.width = this.height = 0;
 				this.resolution = AUTOMATIC;
 			}
 		}
 
-		public int getResolution()
-		{	
+		public int getResolution() {
 			return resolution;
 		}
-		
-		public String getResolutionString()
-		{	
+
+		public String getResolutionString() {
 			if (isPredefined())
 				return (width + "x" + height);
 
-			return (isFitScreen() ? "fitscreen" : isAutomatic() ? "automatic" : "custom");
+			return (isFitScreen() ? "fitscreen" : isAutomatic() ? "automatic"
+					: "custom");
 		}
 
 		public boolean isPredefined() {
-			return (resolution == PREDEFINED);			
+			return (resolution == PREDEFINED);
 		}
-		
+
 		public boolean isAutomatic() {
 			return (resolution == AUTOMATIC);
 		}
@@ -239,29 +227,28 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public void setWidth(int width) {
 			this.width = width;
 		}
-		
+
 		public int getWidth() {
 			return width;
 		}
-		
+
 		public int getHeight() {
 			return height;
 		}
-		
+
 		public void setHeight(int height) {
 			this.height = height;
 		}
-		
+
 		public void setColors(int colors) {
 			this.colors = colors;
 		}
-		
+
 		public int getColors() {
 			return colors;
 		}
-	
-		public static final Parcelable.Creator<ScreenSettings> CREATOR = new Parcelable.Creator<ScreenSettings>()
-		{
+
+		public static final Parcelable.Creator<ScreenSettings> CREATOR = new Parcelable.Creator<ScreenSettings>() {
 			public ScreenSettings createFromParcel(Parcel in) {
 				return new ScreenSettings(in);
 			}
@@ -278,19 +265,61 @@ public class BookmarkBase implements Parcelable, Cloneable
 		}
 
 		@Override
-		public void writeToParcel(Parcel out, int flags)
-		{
+		public void writeToParcel(Parcel out, int flags) {
 			out.writeInt(resolution);
 			out.writeInt(colors);
 			out.writeInt(width);
 			out.writeInt(height);
-		}		
+		}
 	}
-	
-	
+
+	public static class DebugSettings implements Parcelable {
+		private int debug;
+
+		public DebugSettings() {
+			init();
+		}
+
+		public DebugSettings(Parcel parcel) {
+			debug = parcel.readInt();
+		}
+
+		private void init() {
+			debug = 0;
+		}
+
+		public int getDebugLevel() {
+			return debug;
+		}
+
+		public void setDebugLevel(int debug) {
+			this.debug = debug;			
+		}
+
+		public static final Parcelable.Creator<DebugSettings> CREATOR = new Parcelable.Creator<DebugSettings>() {
+			public DebugSettings createFromParcel(Parcel in) {
+				return new DebugSettings(in);
+			}
+
+			@Override
+			public DebugSettings[] newArray(int size) {
+				return new DebugSettings[size];
+			}
+		};
+
+		@Override
+		public int describeContents() {
+			return 0;
+		}
+
+		@Override
+		public void writeToParcel(Parcel out, int flags) {
+			out.writeInt(debug);
+		}
+	}
+
 	// Session Settings
-	public static class AdvancedSettings implements Parcelable
-	{
+	public static class AdvancedSettings implements Parcelable {
 		private boolean enable3GSettings;
 		private ScreenSettings screen3G;
 		private PerformanceFlags performance3G;
@@ -308,17 +337,19 @@ public class BookmarkBase implements Parcelable, Cloneable
 
 		public AdvancedSettings(Parcel parcel) {
 			enable3GSettings = (parcel.readInt() == 1) ? true : false;
-			screen3G = parcel.readParcelable(ScreenSettings.class.getClassLoader());
-			performance3G = parcel.readParcelable(PerformanceFlags.class.getClassLoader());
+			screen3G = parcel.readParcelable(ScreenSettings.class
+					.getClassLoader());
+			performance3G = parcel.readParcelable(PerformanceFlags.class
+					.getClassLoader());
 			redirectSDCard = (parcel.readInt() == 1) ? true : false;
 			redirectSound = parcel.readInt();
 			redirectMicrophone = (parcel.readInt() == 1) ? true : false;
 			security = parcel.readInt();
 			consoleMode = (parcel.readInt() == 1) ? true : false;
 			remoteProgram = parcel.readString();
-			workDir = parcel.readString();			
+			workDir = parcel.readString();
 		}
-				
+
 		private void init() {
 			enable3GSettings = false;
 			screen3G = new ScreenSettings();
@@ -331,11 +362,11 @@ public class BookmarkBase implements Parcelable, Cloneable
 			remoteProgram = "";
 			workDir = "";
 		}
-		
+
 		public void setEnable3GSettings(boolean enable3GSettings) {
 			this.enable3GSettings = enable3GSettings;
 		}
-		
+
 		public boolean getEnable3GSettings() {
 			return enable3GSettings;
 		}
@@ -343,81 +374,76 @@ public class BookmarkBase implements Parcelable, Cloneable
 		public ScreenSettings getScreen3G() {
 			return screen3G;
 		}
-		
+
 		public void setScreen3G(ScreenSettings screen3G) {
-			this.screen3G = screen3G; 
+			this.screen3G = screen3G;
 		}
 
 		public PerformanceFlags getPerformance3G() {
 			return performance3G;
 		}
-		
+
 		public void setPerformance3G(PerformanceFlags performance3G) {
-			this.performance3G = performance3G; 
+			this.performance3G = performance3G;
 		}
 
 		public void setRedirectSDCard(boolean redirectSDCard) {
 			this.redirectSDCard = redirectSDCard;
 		}
-		
+
 		public boolean getRedirectSDCard() {
 			return redirectSDCard;
 		}
-		
+
 		public void setRedirectSound(int redirect) {
 			this.redirectSound = redirect;
 		}
-		
+
 		public int getRedirectSound() {
 			return redirectSound;
 		}
-		
+
 		public void setRedirectMicrophone(boolean redirect) {
 			this.redirectMicrophone = redirect;
 		}
-		
+
 		public boolean getRedirectMicrophone() {
 			return redirectMicrophone;
 		}
-		
+
 		public void setSecurity(int security) {
 			this.security = security;
 		}
-		
+
 		public int getSecurity() {
 			return security;
 		}
-		
+
 		public void setConsoleMode(boolean consoleMode) {
 			this.consoleMode = consoleMode;
 		}
-		
+
 		public boolean getConsoleMode() {
 			return consoleMode;
 		}
-		
-		public void setRemoteProgram(String remoteProgram)
-		{
+
+		public void setRemoteProgram(String remoteProgram) {
 			this.remoteProgram = remoteProgram;
 		}
-		
-		public String getRemoteProgram()
-		{	
+
+		public String getRemoteProgram() {
 			return remoteProgram;
 		}
-		
-		public void setWorkDir(String workDir)
-		{
+
+		public void setWorkDir(String workDir) {
 			this.workDir = workDir;
 		}
-		
-		public String getWorkDir()
-		{	
+
+		public String getWorkDir() {
 			return workDir;
-		}		
-		
-		public static final Parcelable.Creator<AdvancedSettings> CREATOR = new Parcelable.Creator<AdvancedSettings>()
-		{
+		}
+
+		public static final Parcelable.Creator<AdvancedSettings> CREATOR = new Parcelable.Creator<AdvancedSettings>() {
 			public AdvancedSettings createFromParcel(Parcel in) {
 				return new AdvancedSettings(in);
 			}
@@ -434,23 +460,22 @@ public class BookmarkBase implements Parcelable, Cloneable
 		}
 
 		@Override
-		public void writeToParcel(Parcel out, int flags)
-		{
+		public void writeToParcel(Parcel out, int flags) {
 			out.writeInt(enable3GSettings ? 1 : 0);
 			out.writeParcelable(screen3G, flags);
 			out.writeParcelable(performance3G, flags);
 			out.writeInt(redirectSDCard ? 1 : 0);
 			out.writeInt(redirectSound);
 			out.writeInt(redirectMicrophone ? 1 : 0);
-			out.writeInt(security);		
-			out.writeInt(consoleMode ? 1 : 0);		
+			out.writeInt(security);
+			out.writeInt(consoleMode ? 1 : 0);
 			out.writeString(remoteProgram);
 			out.writeString(workDir);
-		}		
+		}
 	}
-	
-	protected int  type;
-	private long   id;
+
+	protected int type;
+	private long id;
 	private String label;
 	private String username;
 	private String password;
@@ -459,23 +484,23 @@ public class BookmarkBase implements Parcelable, Cloneable
 	private ScreenSettings screenSettings;
 	private PerformanceFlags performanceFlags;
 	private AdvancedSettings advancedSettings;
-	
-	private void init()
-	{
+	private DebugSettings debugSettings;
+
+	private void init() {
 		type = TYPE_INVALID;
 		id = -1;
 		label = "";
 		username = "";
 		password = "";
-		domain  = "";
-		
+		domain = "";
+
 		screenSettings = new ScreenSettings();
 		performanceFlags = new PerformanceFlags();
 		advancedSettings = new AdvancedSettings();
+		debugSettings = new DebugSettings();
 	}
-	
-	public BookmarkBase(Parcel parcel)
-	{
+
+	public BookmarkBase(Parcel parcel) {
 		type = parcel.readInt();
 		id = parcel.readLong();
 		label = parcel.readString();
@@ -483,62 +508,69 @@ public class BookmarkBase implements Parcelable, Cloneable
 		password = parcel.readString();
 		domain = parcel.readString();
 
-		screenSettings = parcel.readParcelable(ScreenSettings.class.getClassLoader());
-		performanceFlags = parcel.readParcelable(PerformanceFlags.class.getClassLoader());
-		advancedSettings = parcel.readParcelable(AdvancedSettings.class.getClassLoader());
+		screenSettings = parcel.readParcelable(ScreenSettings.class
+				.getClassLoader());
+		performanceFlags = parcel.readParcelable(PerformanceFlags.class
+				.getClassLoader());
+		advancedSettings = parcel.readParcelable(AdvancedSettings.class
+				.getClassLoader());
+		debugSettings = parcel.readParcelable(DebugSettings.class
+				.getClassLoader());
 	}
-		
+
 	public BookmarkBase() {
 		init();
 	}
 
 	@SuppressWarnings("unchecked")
-	public <T extends BookmarkBase> T get() { return (T)this; }
+	public <T extends BookmarkBase> T get() {
+		return (T) this;
+	}
 
 	public int getType() {
 		return type;
 	}
-	
+
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	public long getId() {
 		return id;
 	}
-	
+
 	public void setLabel(String label) {
 		this.label = label;
 	}
-	
+
 	public String getLabel() {
 		return label;
 	}
-	
+
 	public void setUsername(String username) {
 		this.username = username;
 	}
-	
+
 	public String getUsername() {
 		return username;
 	}
-	
+
 	public void setPassword(String password) {
 		this.password = password;
 	}
-	
+
 	public String getPassword() {
 		return password;
 	}
-	
+
 	public void setDomain(String domain) {
 		this.domain = domain;
 	}
-	
+
 	public String getDomain() {
 		return domain;
 	}
-	
+
 	public void setScreenSettings(ScreenSettings screenSettings) {
 		this.screenSettings = screenSettings;
 	}
@@ -550,11 +582,11 @@ public class BookmarkBase implements Parcelable, Cloneable
 	public void setPerformanceFlags(PerformanceFlags performanceFlags) {
 		this.performanceFlags = performanceFlags;
 	}
-	
+
 	public PerformanceFlags getPerformanceFlags() {
 		return performanceFlags;
 	}
-	
+
 	public void setAdvancedSettings(AdvancedSettings advancedSettings) {
 		this.advancedSettings = advancedSettings;
 	}
@@ -562,19 +594,28 @@ public class BookmarkBase implements Parcelable, Cloneable
 	public AdvancedSettings getAdvancedSettings() {
 		return advancedSettings;
 	}
-	
-	public ScreenSettings getActiveScreenSettings()
-	{
-		return (GlobalApp.ConnectedTo3G && advancedSettings.getEnable3GSettings()) ? advancedSettings.getScreen3G() : screenSettings; 
-	}
-	
-	public PerformanceFlags getActivePerformanceFlags()
-	{
-		return (GlobalApp.ConnectedTo3G && advancedSettings.getEnable3GSettings()) ? advancedSettings.getPerformance3G() : performanceFlags; 
+
+	public void setDebugSettings(DebugSettings debugSettings) {
+		this.debugSettings = debugSettings;
 	}
 
-	public static final Parcelable.Creator<BookmarkBase> CREATOR = new Parcelable.Creator<BookmarkBase>()
-	{
+	public DebugSettings getDebugSettings() {
+		return debugSettings;
+	}
+
+	public ScreenSettings getActiveScreenSettings() {
+		return (GlobalApp.ConnectedTo3G && advancedSettings
+				.getEnable3GSettings()) ? advancedSettings.getScreen3G()
+				: screenSettings;
+	}
+
+	public PerformanceFlags getActivePerformanceFlags() {
+		return (GlobalApp.ConnectedTo3G && advancedSettings
+				.getEnable3GSettings()) ? advancedSettings.getPerformance3G()
+				: performanceFlags;
+	}
+
+	public static final Parcelable.Creator<BookmarkBase> CREATOR = new Parcelable.Creator<BookmarkBase>() {
 		public BookmarkBase createFromParcel(Parcel in) {
 			return new BookmarkBase(in);
 		}
@@ -584,15 +625,14 @@ public class BookmarkBase implements Parcelable, Cloneable
 			return new BookmarkBase[size];
 		}
 	};
-	
+
 	@Override
 	public int describeContents() {
 		return 0;
 	}
 
 	@Override
-	public void writeToParcel(Parcel out, int flags)
-	{
+	public void writeToParcel(Parcel out, int flags) {
 		out.writeInt(type);
 		out.writeLong(id);
 		out.writeString(label);
@@ -603,11 +643,14 @@ public class BookmarkBase implements Parcelable, Cloneable
 		out.writeParcelable(screenSettings, flags);
 		out.writeParcelable(performanceFlags, flags);
 		out.writeParcelable(advancedSettings, flags);
+		out.writeParcelable(debugSettings, flags);
 	}
 
 	// write to shared preferences
-	public void writeToSharedPreferences(SharedPreferences sharedPrefs) 
-	{
+	public void writeToSharedPreferences(SharedPreferences sharedPrefs) {
+		
+		Locale locale = Locale.ENGLISH;
+		
 		SharedPreferences.Editor editor = sharedPrefs.edit();
 		editor.clear();
 		editor.putString("bookmark.label", label);
@@ -616,95 +659,151 @@ public class BookmarkBase implements Parcelable, Cloneable
 		editor.putString("bookmark.domain", domain);
 
 		editor.putInt("bookmark.colors", screenSettings.getColors());
-		editor.putString("bookmark.resolution", screenSettings.getResolutionString().toLowerCase());
+		editor.putString("bookmark.resolution", screenSettings
+				.getResolutionString().toLowerCase(locale));
 		editor.putInt("bookmark.width", screenSettings.getWidth());
 		editor.putInt("bookmark.height", screenSettings.getHeight());
 
-		editor.putBoolean("bookmark.perf_remotefx", performanceFlags.getRemoteFX());
-		editor.putBoolean("bookmark.perf_wallpaper", performanceFlags.getWallpaper());
-		editor.putBoolean("bookmark.perf_font_smoothing", performanceFlags.getFontSmoothing());
-		editor.putBoolean("bookmark.perf_desktop_composition", performanceFlags.getDesktopComposition());
-		editor.putBoolean("bookmark.perf_window_dragging", performanceFlags.getFullWindowDrag());
-		editor.putBoolean("bookmark.perf_menu_animation", performanceFlags.getMenuAnimations());
+		editor.putBoolean("bookmark.perf_remotefx",
+				performanceFlags.getRemoteFX());
+		editor.putBoolean("bookmark.perf_wallpaper",
+				performanceFlags.getWallpaper());
+		editor.putBoolean("bookmark.perf_font_smoothing",
+				performanceFlags.getFontSmoothing());
+		editor.putBoolean("bookmark.perf_desktop_composition",
+				performanceFlags.getDesktopComposition());
+		editor.putBoolean("bookmark.perf_window_dragging",
+				performanceFlags.getFullWindowDrag());
+		editor.putBoolean("bookmark.perf_menu_animation",
+				performanceFlags.getMenuAnimations());
 		editor.putBoolean("bookmark.perf_themes", performanceFlags.getTheming());
-		
-		editor.putBoolean("bookmark.enable_3g_settings", advancedSettings.getEnable3GSettings());
 
-		editor.putInt("bookmark.colors_3g", advancedSettings.getScreen3G().getColors());
-		editor.putString("bookmark.resolution_3g", advancedSettings.getScreen3G().getResolutionString().toLowerCase());
-		editor.putInt("bookmark.width_3g", advancedSettings.getScreen3G().getWidth());
-		editor.putInt("bookmark.height_3g", advancedSettings.getScreen3G().getHeight());
+		editor.putBoolean("bookmark.enable_3g_settings",
+				advancedSettings.getEnable3GSettings());
 
-		editor.putBoolean("bookmark.perf_remotefx_3g", advancedSettings.getPerformance3G().getRemoteFX());
-		editor.putBoolean("bookmark.perf_wallpaper_3g", advancedSettings.getPerformance3G().getWallpaper());
-		editor.putBoolean("bookmark.perf_font_smoothing_3g", advancedSettings.getPerformance3G().getFontSmoothing());
-		editor.putBoolean("bookmark.perf_desktop_composition_3g", advancedSettings.getPerformance3G().getDesktopComposition());
-		editor.putBoolean("bookmark.perf_window_dragging_3g", advancedSettings.getPerformance3G().getFullWindowDrag());
-		editor.putBoolean("bookmark.perf_menu_animation_3g", advancedSettings.getPerformance3G().getMenuAnimations());
-		editor.putBoolean("bookmark.perf_themes_3g", advancedSettings.getPerformance3G().getTheming());
+		editor.putInt("bookmark.colors_3g", advancedSettings.getScreen3G()
+				.getColors());
+		editor.putString("bookmark.resolution_3g", advancedSettings
+				.getScreen3G().getResolutionString().toLowerCase(locale));
+		editor.putInt("bookmark.width_3g", advancedSettings.getScreen3G()
+				.getWidth());
+		editor.putInt("bookmark.height_3g", advancedSettings.getScreen3G()
+				.getHeight());
 
-		editor.putBoolean("bookmark.redirect_sdcard", advancedSettings.getRedirectSDCard());
-		editor.putInt("bookmark.redirect_sound", advancedSettings.getRedirectSound());
-		editor.putBoolean("bookmark.redirect_microphone", advancedSettings.getRedirectMicrophone());
+		editor.putBoolean("bookmark.perf_remotefx_3g", advancedSettings
+				.getPerformance3G().getRemoteFX());
+		editor.putBoolean("bookmark.perf_wallpaper_3g", advancedSettings
+				.getPerformance3G().getWallpaper());
+		editor.putBoolean("bookmark.perf_font_smoothing_3g", advancedSettings
+				.getPerformance3G().getFontSmoothing());
+		editor.putBoolean("bookmark.perf_desktop_composition_3g",
+				advancedSettings.getPerformance3G().getDesktopComposition());
+		editor.putBoolean("bookmark.perf_window_dragging_3g", advancedSettings
+				.getPerformance3G().getFullWindowDrag());
+		editor.putBoolean("bookmark.perf_menu_animation_3g", advancedSettings
+				.getPerformance3G().getMenuAnimations());
+		editor.putBoolean("bookmark.perf_themes_3g", advancedSettings
+				.getPerformance3G().getTheming());
+
+		editor.putBoolean("bookmark.redirect_sdcard",
+				advancedSettings.getRedirectSDCard());
+		editor.putInt("bookmark.redirect_sound",
+				advancedSettings.getRedirectSound());
+		editor.putBoolean("bookmark.redirect_microphone",
+				advancedSettings.getRedirectMicrophone());
 		editor.putInt("bookmark.security", advancedSettings.getSecurity());
-		editor.putString("bookmark.remote_program", advancedSettings.getRemoteProgram());
+		editor.putString("bookmark.remote_program",
+				advancedSettings.getRemoteProgram());
 		editor.putString("bookmark.work_dir", advancedSettings.getWorkDir());
-		editor.putBoolean("bookmark.console_mode", advancedSettings.getConsoleMode());
+		editor.putBoolean("bookmark.console_mode",
+				advancedSettings.getConsoleMode());
+
+		editor.putInt("bookmark.debug_level",
+				debugSettings.getDebugLevel());
 		
 		editor.commit();
 	}
 
 	// read from shared preferences
-	public void readFromSharedPreferences(SharedPreferences sharedPrefs) 
-	{
+	public void readFromSharedPreferences(SharedPreferences sharedPrefs) {
 		label = sharedPrefs.getString("bookmark.label", "");
 		username = sharedPrefs.getString("bookmark.username", "");
 		password = sharedPrefs.getString("bookmark.password", "");
 		domain = sharedPrefs.getString("bookmark.domain", "");
 
 		screenSettings.setColors(sharedPrefs.getInt("bookmark.colors", 16));
-		screenSettings.setResolution(sharedPrefs.getString("bookmark.resolution", "automatic"), sharedPrefs.getInt("bookmark.width", 800), sharedPrefs.getInt("bookmark.height", 600));
+		screenSettings.setResolution(
+				sharedPrefs.getString("bookmark.resolution", "automatic"),
+				sharedPrefs.getInt("bookmark.width", 800),
+				sharedPrefs.getInt("bookmark.height", 600));
 
-		performanceFlags.setRemoteFX(sharedPrefs.getBoolean("bookmark.perf_remotefx", false));
-		performanceFlags.setWallpaper(sharedPrefs.getBoolean("bookmark.perf_wallpaper", false));
-		performanceFlags.setFontSmoothing(sharedPrefs.getBoolean("bookmark.perf_font_smoothing", false));
-		performanceFlags.setDesktopComposition(sharedPrefs.getBoolean("bookmark.perf_desktop_composition", false));
-		performanceFlags.setFullWindowDrag(sharedPrefs.getBoolean("bookmark.perf_window_dragging", false));
-		performanceFlags.setMenuAnimations(sharedPrefs.getBoolean("bookmark.perf_menu_animation", false));
-		performanceFlags.setTheming(sharedPrefs.getBoolean("bookmark.perf_themes", false));
+		performanceFlags.setRemoteFX(sharedPrefs.getBoolean(
+				"bookmark.perf_remotefx", false));
+		performanceFlags.setWallpaper(sharedPrefs.getBoolean(
+				"bookmark.perf_wallpaper", false));
+		performanceFlags.setFontSmoothing(sharedPrefs.getBoolean(
+				"bookmark.perf_font_smoothing", false));
+		performanceFlags.setDesktopComposition(sharedPrefs.getBoolean(
+				"bookmark.perf_desktop_composition", false));
+		performanceFlags.setFullWindowDrag(sharedPrefs.getBoolean(
+				"bookmark.perf_window_dragging", false));
+		performanceFlags.setMenuAnimations(sharedPrefs.getBoolean(
+				"bookmark.perf_menu_animation", false));
+		performanceFlags.setTheming(sharedPrefs.getBoolean(
+				"bookmark.perf_themes", false));
+
+		advancedSettings.setEnable3GSettings(sharedPrefs.getBoolean(
+				"bookmark.enable_3g_settings", false));
+
+		advancedSettings.getScreen3G().setColors(
+				sharedPrefs.getInt("bookmark.colors_3g", 16));
+		advancedSettings.getScreen3G().setResolution(
+				sharedPrefs.getString("bookmark.resolution_3g", "automatic"),
+				sharedPrefs.getInt("bookmark.width_3g", 800),
+				sharedPrefs.getInt("bookmark.height_3g", 600));
+
+		advancedSettings.getPerformance3G().setRemoteFX(
+				sharedPrefs.getBoolean("bookmark.perf_remotefx_3g", false));
+		advancedSettings.getPerformance3G().setWallpaper(
+				sharedPrefs.getBoolean("bookmark.perf_wallpaper_3g", false));
+		advancedSettings.getPerformance3G().setFontSmoothing(
+				sharedPrefs
+						.getBoolean("bookmark.perf_font_smoothing_3g", false));
+		advancedSettings.getPerformance3G().setDesktopComposition(
+				sharedPrefs.getBoolean("bookmark.perf_desktop_composition_3g",
+						false));
+		advancedSettings.getPerformance3G().setFullWindowDrag(
+				sharedPrefs.getBoolean("bookmark.perf_window_dragging_3g",
+						false));
+		advancedSettings.getPerformance3G().setMenuAnimations(
+				sharedPrefs
+						.getBoolean("bookmark.perf_menu_animation_3g", false));
+		advancedSettings.getPerformance3G().setTheming(
+				sharedPrefs.getBoolean("bookmark.perf_themes_3g", false));
+
+		advancedSettings.setRedirectSDCard(sharedPrefs.getBoolean(
+				"bookmark.redirect_sdcard", false));
+		advancedSettings.setRedirectSound(sharedPrefs.getInt(
+				"bookmark.redirect_sound", 0));
+		advancedSettings.setRedirectMicrophone(sharedPrefs.getBoolean(
+				"bookmark.redirect_microphone", false));
+		advancedSettings
+				.setSecurity(sharedPrefs.getInt("bookmark.security", 0));
+		advancedSettings.setRemoteProgram(sharedPrefs.getString(
+				"bookmark.remote_program", ""));
+		advancedSettings.setWorkDir(sharedPrefs.getString("bookmark.work_dir",
+				""));
+		advancedSettings.setConsoleMode(sharedPrefs.getBoolean(
+				"bookmark.console_mode", false));
 		
-		advancedSettings.setEnable3GSettings(sharedPrefs.getBoolean("bookmark.enable_3g_settings", false));
-
-		advancedSettings.getScreen3G().setColors(sharedPrefs.getInt("bookmark.colors_3g", 16));
-		advancedSettings.getScreen3G().setResolution(sharedPrefs.getString("bookmark.resolution_3g", "automatic"), 
-													 sharedPrefs.getInt("bookmark.width_3g", 800), sharedPrefs.getInt("bookmark.height_3g", 600));
-
-		advancedSettings.getPerformance3G().setRemoteFX(sharedPrefs.getBoolean("bookmark.perf_remotefx_3g", false));
-		advancedSettings.getPerformance3G().setWallpaper(sharedPrefs.getBoolean("bookmark.perf_wallpaper_3g", false));
-		advancedSettings.getPerformance3G().setFontSmoothing(sharedPrefs.getBoolean("bookmark.perf_font_smoothing_3g", false));
-		advancedSettings.getPerformance3G().setDesktopComposition(sharedPrefs.getBoolean("bookmark.perf_desktop_composition_3g", false));
-		advancedSettings.getPerformance3G().setFullWindowDrag(sharedPrefs.getBoolean("bookmark.perf_window_dragging_3g", false));
-		advancedSettings.getPerformance3G().setMenuAnimations(sharedPrefs.getBoolean("bookmark.perf_menu_animation_3g", false));
-		advancedSettings.getPerformance3G().setTheming(sharedPrefs.getBoolean("bookmark.perf_themes_3g", false));
-
-		advancedSettings.setRedirectSDCard(sharedPrefs.getBoolean("bookmark.redirect_sdcard", false));
-		advancedSettings.setRedirectSound(sharedPrefs.getInt("bookmark.redirect_sound", 0));
-		advancedSettings.setRedirectMicrophone(sharedPrefs.getBoolean("bookmark.redirect_microphone", false));
-		advancedSettings.setSecurity(sharedPrefs.getInt("bookmark.security", 0));
-		advancedSettings.setRemoteProgram(sharedPrefs.getString("bookmark.remote_program", ""));
-		advancedSettings.setWorkDir(sharedPrefs.getString("bookmark.work_dir", ""));
-		advancedSettings.setConsoleMode(sharedPrefs.getBoolean("bookmark.console_mode", false));
+		debugSettings.setDebugLevel(sharedPrefs.getInt("bookmark.debug_level", 0));
 	}
 
 	// Cloneable
-	public Object clone()
-	{
-		try
-		{
-			return super.clone();					
-		}
-		catch(CloneNotSupportedException e)
-		{
+	public Object clone() {
+		try {
+			return super.clone();
+		} catch (CloneNotSupportedException e) {
 			return null;
 		}
 	}

client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java

@@ -70,6 +70,8 @@ public abstract class BookmarkBaseGateway
 		values.put("console_mode", bookmark.getAdvancedSettings().getConsoleMode());
 		values.put("remote_program", bookmark.getAdvancedSettings().getRemoteProgram());
 		values.put("work_dir", bookmark.getAdvancedSettings().getWorkDir());
+		
+		values.put("debug_level", bookmark.getDebugSettings().getDebugLevel());
 
 		// add any special columns
 		addBookmarkSpecificColumns(bookmark, values);
@@ -109,6 +111,8 @@ public abstract class BookmarkBaseGateway
 		values.put("remote_program", bookmark.getAdvancedSettings().getRemoteProgram());
 		values.put("work_dir", bookmark.getAdvancedSettings().getWorkDir());
 		
+		values.put("debug_level", bookmark.getDebugSettings().getDebugLevel());
+		
 		addBookmarkSpecificColumns(bookmark, values);
 				
 		// update bookmark
@@ -229,6 +233,9 @@ public abstract class BookmarkBaseGateway
 		columns.add("console_mode");
 		columns.add("remote_program");
 		columns.add("work_dir");
+	
+		// debug settings
+		columns.add("debug_level");
 		
 		addBookmarkSpecificColumns(columns);		
 	}
@@ -290,6 +297,8 @@ public abstract class BookmarkBaseGateway
 		bookmark.getAdvancedSettings().setRemoteProgram(cursor.getString(cursor.getColumnIndex("remote_program")));		
 		bookmark.getAdvancedSettings().setWorkDir(cursor.getString(cursor.getColumnIndex("work_dir")));		
 		
+		bookmark.getDebugSettings().setDebugLevel(cursor.getInt(cursor.getColumnIndex("debug_level")));	
+		
 		readBookmarkSpecificColumns(bookmark, cursor);
 
 		return bookmark;

client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java

@@ -22,7 +22,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 
 public class BookmarkDB extends SQLiteOpenHelper
 {
-	private static final int DB_VERSION = 4;
+	private static final int DB_VERSION = 6;
 	private static final String DB_NAME = "bookmarks.db";
 	
 	public static final String ID = BaseColumns._ID;
@@ -106,7 +106,8 @@ public class BookmarkDB extends SQLiteOpenHelper
 			+ "security, "
 			+ "remote_program, "
 			+ "work_dir, "
-			+ "console_mode) "			
+			+ "console_mode, "
+			+ "debug_level ) "			
 			+ "VALUES ( "
 			+ "'Test Server', "
 			+ "'testservice.afreerdp.com', "
@@ -114,7 +115,7 @@ public class BookmarkDB extends SQLiteOpenHelper
 			+ "'', "
 			+ "'', "
 			+ "3389, "
-			+ "1, 1, 2, 2, 0, 0, 0, 0, '', '', 0);";
+			+ "1, 1, 2, 2, 0, 0, 0, 0, '', '', 0, 0);";
 		db.execSQL(sqlInsertDefaultSessionEntry);
 	}
 
@@ -149,6 +150,7 @@ public class BookmarkDB extends SQLiteOpenHelper
 			+ "remote_program TEXT, "
 			+ "work_dir TEXT, "
 			+ "console_mode INTEGER, "
+			+ "debug_level INTEGER DEFAULT 0, "
 			
 			+ "FOREIGN KEY(screen_settings) REFERENCES tbl_screen_settings(" + ID + "), "
 			+ "FOREIGN KEY(performance_flags) REFERENCES tbl_performance_flags(" + ID + "), "

client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/BuildConfiguration.java.in

@@ -0,0 +1,15 @@
+package com.freerdp.freerdpcore.utils;
+
+public class BuildConfiguration {
+	public static final String WITH_ANDROID_DEBUG_MENU = "@WITH_ANDROID_DEBUG_MENU@";
+
+	public static final int FREERDP_VERSION_MAJOR = @FREERDP_VERSION_MAJOR@;
+	public static final int FREERDP_VERSION_MINOR = @FREERDP_VERSION_MINOR@;
+	public static final int FREERDP_VERSION_REVISION = @FREERDP_VERSION_REVISION@;
+
+	public static final String FREERDP_VERSION_SUFFIX = "@FREERDP_VERSION_SUFFIX@";
+	public static final String FREERDP_API_VERSION = "@FREERDP_API_VERSION@";
+	public static final String FREERDP_VERSION = "@FREERDP_VERSION@";
+	public static final String FREERDP_VERSION_FULL = "@FREERDP_VERSION_FULL@";
+	public static final String GIT_REVISION = "@GIT_REVISION@";
+	}

cmake/ConfigOptionsAndroid.cmake

@@ -21,9 +21,12 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 endif()
 
 option(WITH_DEBUG_ANDROID_JNI "Enable debug output for android jni bindings" ${DEFAULT_DEBUG_OPTION})
+option(WITH_ANDROID_DEBUG_MENU "Enable debug output for android jni bindings" ${DEFAULT_DEBUG_OPTION})
+option(WITH_OPENSLES "Enable sound and microphone redirection using OpenSLES" ON)
 option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON)
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})
 	
 set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK")
 set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")
+