Merge branch 'master' of github.com:FreeRDP/FreeRDP

CMakeLists.txt

@@ -209,7 +209,7 @@ if(ANDROID)
 		message(STATUS "FREERDP_ANDROID_EXTERNAL_SSL_PATH not set! - Needs to be set if openssl is not found in the android NDK (which usually isn't)")
 	endif()
 	set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_ANDROID_EXTERNAL_SSL_PATH})
-	set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/client/Android/libs/${ANDROID_ABI})
+	set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/client/Android/FreeRDPCore/libs/${ANDROID_ABI})
 endif()
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)

client/Android/AndroidManifest.xml.cmake

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	android:installLocation="auto"
-	package="com.freerdp.afreerdp"
-	android:versionCode="1"
-	android:versionName="@FREERDP_VERSION_FULL@" >
-
-	<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="com.android.vending.BILLING" />
-    <supports-screens android:anyDensity="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" />
-			
-	<application android:name="com.freerdp.afreerdp.application.GlobalApp"
-		android:label="aFreeRDP"
-		android:icon="@drawable/icon_launcher_freerdp" >
-
-			<!-- Main activity -->
-			<activity android:name="com.freerdp.afreerdp.presentation.HomeActivity"
-				android:label="@string/app_title"
-				android:theme="@style/Theme.Main"
-				android:alwaysRetainTaskState="true"
-				>
-				<intent-filter android:label="@string/app_title">
-					<action android:name="android.intent.action.MAIN"/>
-					<category android:name="android.intent.category.LAUNCHER"/>
-				</intent-filter>
-			</activity>
-
-			<!-- Acra crash report dialog activity -->
-			<activity android:name="org.acra.CrashReportDialog"
-                        android:theme="@android:style/Theme.Dialog" android:launchMode="singleInstance"
-                        android:excludeFromRecents="true" android:finishOnTaskLaunch="true" />
-			
-			<!-- Session request handler activity - used for search and internally to start sessions -->
-			<activity android:name="com.freerdp.afreerdp.services.SessionRequestHandlerActivity"
-				android:theme="@android:style/Theme.NoDisplay"
-				android:noHistory="true"
-				android:excludeFromRecents="true">
-				<intent-filter>
-					<action android:name="android.intent.action.SEARCH" />
-				</intent-filter>
-				<meta-data android:name="android.app.searchable" 
-					android:resource="@xml/searchable" />
-			</activity>
-
-			<!-- Activity to create shortcuts -->
-	        <activity android:name="com.freerdp.afreerdp.presentation.ShortcutsActivity"
-	  				  android:theme="@style/Theme.Main"
-	                  android:label="@string/title_create_shortcut">
-	            <intent-filter>
-	                <action android:name="android.intent.action.MAIN" />
-	                <category android:name="android.intent.category.DEFAULT" />
-	            </intent-filter>
-	
-	        </activity>
-			
-	        <!-- It is recommended that you use an activity-alias to provide the "CREATE_SHORTCUT" -->
-	        <!-- intent-filter.  This gives you a way to set the text (and optionally the -->
-	        <!-- icon) that will be seen in the launcher's create-shortcut user interface. -->	
-	        <activity-alias android:name="com.freerdp.afreerdp.presentation.CreateShortcuts"
-	            android:targetActivity="com.freerdp.afreerdp.presentation.ShortcutsActivity"
-	            android:label="@string/title_create_shortcut">	
-	            <!--  This intent-filter allows your shortcuts to be created in the launcher. -->
-	            <intent-filter>
-	                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-	                <category android:name="android.intent.category.DEFAULT" />
-	            </intent-filter>	
-	        </activity-alias>					
-						
-			<activity android:name="com.freerdp.afreerdp.presentation.BookmarkActivity"
-				android:label="@string/title_bookmark_settings"
-				android:theme="@style/Theme.Settings">
-			</activity>
-			<activity android:name="com.freerdp.afreerdp.presentation.ApplicationSettingsActivity"
-				android:label="@string/title_application_settings"
-				android:theme="@style/Theme.Settings"
-				android:windowSoftInputMode="stateHidden">
-			</activity>
-			<activity android:name="com.freerdp.afreerdp.presentation.SessionActivity"
-				android:theme="@android:style/Theme.Black.NoTitleBar"
-				android:configChanges="orientation|keyboardHidden|keyboard"
-				android:windowSoftInputMode="adjustResize">
-			</activity>
-			<activity android:name="com.freerdp.afreerdp.presentation.AboutActivity"
-				android:label="@string/title_about"
-				android:theme="@style/Theme.Main">
-			</activity>
-			<activity android:name="com.freerdp.afreerdp.presentation.HelpActivity"
-				android:label="@string/title_help"
-				android:theme="@style/Theme.Main">
-			</activity>
-									
-			<provider android:name="com.freerdp.afreerdp.services.FreeRDPSuggestionProvider"
-				android:authorities="com.freerdp.afreerdp.services.freerdpsuggestionprovider"
-				>
-			</provider>
-	
-			<receiver android:name="com.freerdp.afreerdp.application.NetworkStateReceiver" android:enabled="true">
-			   <intent-filter>
-			      <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-			   </intent-filter>
-			</receiver>
-
-								
-	</application>
-	
-</manifest>

client/Android/CMakeLists.txt

@@ -1,7 +1,6 @@
 # FreeRDP: A Remote Desktop Protocol Implementation
 # Android Client
 #
-# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 # Copyright 2013 Bernhard Miklautz <bmiklautz@thinstuff.at>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,23 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(ANDROID_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(ANDROID_PACKAGE_NAME "aFreeRDP")
-
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml @ONLY)
-
-if (ANDROID_SDK)
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/local.properties.cmake ${CMAKE_CURRENT_SOURCE_DIR}/local.properties @ONLY)
-endif()
-
-add_subdirectory(jni)
-
-
 if(ANDROID_BUILD_JAVA)
 	if (NOT ANDROID_SDK)
 		message(FATAL_ERROR "ANDROID_SDK not set but required for building the java gui (ANDROID_BUILD_JAVA)")
 	endif()
-
 	# And isn't shiped with the android ndk/sdk so
 	# we need to find it on the local machine
   SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, BOTH)
@@ -45,20 +31,10 @@ if(ANDROID_BUILD_JAVA)
 
 	if(ANDROID_BUILD_JAVA_DEBUG)
 		set(ANDROID_BUILD_TYPE "debug")
-		set(APK "${ANDROID_SOURCE_DIR}/bin/${ANDROID_PACKAGE_NAME}-release-unsigned.apk")
 	else()
 		set(ANDROID_BUILD_TYPE "release")
-		set(APK "${ANDROID_SOURCE_DIR}/bin/${ANDROID_PACKAGE_NAME}-debug.apk")
 	endif()
+endif(ANDROID_BUILD_JAVA)
 
-  # command to create the android package
-	add_custom_command(
-		OUTPUT "${APK}"
-		COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
-		WORKING_DIRECTORY "${ANDROID_SOURCE_DIR}"
-		MAIN_DEPENDENCY AndroidManifest.xml
-		DEPENDS freerdp-android local.properties
-	)
-	add_custom_target(android-package ALL SOURCES "${APK}")
-	SET_DIRECTORY_PROPERTIES(PROPERTIES  ADDITIONAL_MAKE_CLEAN_FILES "gen;bin")
-endif()
+add_subdirectory(FreeRDPCore)
+add_subdirectory(aFreeRDP)

client/Android/FreeRDPCore/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

client/Android/FreeRDPCore/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FreeRDPCore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

client/Android/FreeRDPCore/AndroidManifest.xml.cmake

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	android:installLocation="auto"
+	package="com.freerdp.freerdpcore"
+	android:versionCode="1"
+	android:versionName="@FREERDP_VERSION_FULL@" >
+
+	<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <supports-screens android:anyDensity="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" />
+
+	<application>
+
+			<!-- Activity to create shortcuts -->
+	        <activity android:name=".presentation.ShortcutsActivity"
+	  				  android:theme="@style/Theme.Main"
+	                  android:label="@string/title_create_shortcut">
+	            <intent-filter>
+	                <action android:name="android.intent.action.MAIN" />
+	                <category android:name="android.intent.category.DEFAULT" />
+	            </intent-filter>
+	        </activity>
+			
+	        <!-- It is recommended that you use an activity-alias to provide the "CREATE_SHORTCUT" -->
+	        <!-- intent-filter.  This gives you a way to set the text (and optionally the -->
+	        <!-- icon) that will be seen in the launcher's create-shortcut user interface. -->	
+	        <activity-alias android:name=".presentation.CreateShortcuts"
+	            android:targetActivity="com.freerdp.freerdpcore.presentation.ShortcutsActivity"
+	            android:label="@string/title_create_shortcut">	
+	            <!--  This intent-filter allows your shortcuts to be created in the launcher. -->
+	            <intent-filter>
+	                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+	                <category android:name="android.intent.category.DEFAULT" />
+	            </intent-filter>	
+	        </activity-alias>					
+						
+			<activity android:name=".presentation.BookmarkActivity"
+				android:label="@string/title_bookmark_settings"
+				android:theme="@style/Theme.Settings">
+	            <intent-filter>
+	                <action android:name="freerdp.intent.action.BOOKMARK" />
+	                <category android:name="android.intent.category.DEFAULT" />
+									<data android:scheme="preferences"/>
+	            </intent-filter>
+			</activity>
+			<activity android:name=".presentation.ApplicationSettingsActivity"
+				android:label="@string/title_application_settings"
+				android:theme="@style/Theme.Settings"
+				android:windowSoftInputMode="stateHidden">
+			</activity>
+			<activity android:name=".presentation.SessionActivity"
+				android:theme="@android:style/Theme.Black.NoTitleBar"
+				android:configChanges="orientation|keyboardHidden|keyboard"
+				android:windowSoftInputMode="adjustResize">
+			</activity>
+			<activity android:name=".presentation.AboutActivity"
+				android:label="@string/title_about"
+				android:theme="@style/Theme.Main">
+			</activity>
+			<activity android:name=".presentation.HelpActivity"
+				android:label="@string/title_help"
+				android:theme="@style/Theme.Main">
+			</activity>
+									
+			<receiver android:name=".application.NetworkStateReceiver" android:enabled="true">
+			   <intent-filter>
+			      <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+			   </intent-filter>
+			</receiver>
+	</application>
+</manifest>

client/Android/FreeRDPCore/CMakeLists.txt

@@ -0,0 +1,44 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# Android Client
+#
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+# Copyright 2013 Bernhard Miklautz <bmiklautz@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.
+
+set(ANDROID_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(ANDROID_PACKAGE_NAME "aFreeRDPCore")
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml @ONLY)
+
+if (ANDROID_SDK)
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/local.properties.cmake ${CMAKE_CURRENT_SOURCE_DIR}/local.properties @ONLY)
+endif()
+
+add_subdirectory(jni)
+
+
+if(ANDROID_BUILD_JAVA)
+	set(ANDROIDLIB "${ANDROID_SOURCE_DIR}/bin/classes.jar")
+
+  # command to create the android package
+	add_custom_command(
+		OUTPUT "${ANDROIDLIB}"
+		COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
+		WORKING_DIRECTORY "${ANDROID_SOURCE_DIR}"
+		MAIN_DEPENDENCY AndroidManifest.xml
+		DEPENDS freerdp-android local.properties
+	)
+	add_custom_target(android-lib ALL SOURCES "${ANDROIDLIB}")
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "gen;bin")
+endif()

client/Android/FreeRDPCore/ant.properties

@@ -0,0 +1,16 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.

client/Android/FreeRDPCore/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="." default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

client/Android/FreeRDPCore/jni/android_freerdp.c

@@ -24,6 +24,7 @@
 #include <freerdp/utils/event.h>
 #include <freerdp/constants.h>
 #include <freerdp/locale/keyboard.h>
+#include <freerdp/utils/file.h>
 
 #include <android/bitmap.h>
 #include <machine/cpu-features.h>
@@ -536,7 +537,10 @@ JNIEXPORT void JNICALL jni_freerdp_set_data_directory(JNIEnv *env, jclass cls, j
 
 	const jbyte *directory = (*env)->GetStringUTFChars(env, jdirectory, NULL);
 	free(settings->HomePath);
+	free(settings->ConfigPath);
 	settings->HomePath = strdup(directory);
+	settings->ConfigPath = NULL;
+	freerdp_detect_paths(settings);
 	(*env)->ReleaseStringUTFChars(env, jdirectory, directory);
 }
 
@@ -655,7 +659,6 @@ JNIEXPORT void JNICALL jni_freerdp_set_performance_flags(
 		settings->FastPathOutput = TRUE;
 		settings->ColorDepth = 32;
 		settings->LargePointerFlag = TRUE;
-		settings->PerformanceFlags = PERF_FLAG_NONE;
 		settings->FrameMarkerCommandEnabled = TRUE;
 	}
 
@@ -680,6 +683,7 @@ JNIEXPORT void JNICALL jni_freerdp_set_performance_flags(
 
 
 	/* Create performance flags from settings */
+	settings->PerformanceFlags = PERF_FLAG_NONE;
 	if (settings->AllowFontSmoothing)
 		settings->PerformanceFlags |= PERF_ENABLE_FONT_SMOOTHING;
 

client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.c

@@ -20,32 +20,32 @@
 #include "android_freerdp.h"
 #include "android_freerdp_jni.h"
 
-JNIEXPORT jint JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1new(JNIEnv *env, jclass cls)
+JNIEXPORT jint JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new(JNIEnv *env, jclass cls)
 {
 	return jni_freerdp_new(env, cls);
 }
 
-JNIEXPORT void JNICALL JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1free(JNIEnv *env, jclass cls, jint instance)
+JNIEXPORT void JNICALL JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free(JNIEnv *env, jclass cls, jint instance)
 {
 	jni_freerdp_free(env, cls, instance);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1connect(JNIEnv *env, jclass cls, jint instance)
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect(JNIEnv *env, jclass cls, jint instance)
 {
 	return jni_freerdp_connect(env, cls, instance);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1disconnect(JNIEnv *env, jclass cls, jint instance)
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect(JNIEnv *env, jclass cls, jint instance)
 {
 	return jni_freerdp_disconnect(env, cls, instance);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1cancel_1connection(JNIEnv *env, jclass cls, jint instance)
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1cancel_1connection(JNIEnv *env, jclass cls, jint instance)
 {
 	jni_freerdp_cancel_connection(env, cls, instance);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1connection_1info(JNIEnv *env, jclass cls, jint instance,
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1connection_1info(JNIEnv *env, jclass cls, jint instance,
 	jstring jhostname, jstring jusername, jstring jpassword, jstring jdomain, jint width, jint height, jint color_depth, jint port,
 	jboolean console, jint security, jstring certname)
 {
@@ -53,48 +53,48 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se
 			width, height, color_depth, port, console, security, certname);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1advanced_1settings(JNIEnv *env, jclass cls, jint instance, jstring remote_program, jstring work_dir)
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1advanced_1settings(JNIEnv *env, jclass cls, jint instance, jstring remote_program, jstring work_dir)
 {
 	jni_freerdp_set_advanced_settings(env, cls, instance, remote_program, work_dir);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1data_1directory(JNIEnv *env, jclass cls, jint instance, jstring directory)
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1data_1directory(JNIEnv *env, jclass cls, jint instance, jstring directory)
 {
 	jni_freerdp_set_data_directory(env, cls, instance, directory);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1performance_1flags(
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1performance_1flags(
 	JNIEnv *env, jclass cls, jint instance, jboolean remotefx, jboolean disableWallpaper, jboolean disableFullWindowDrag,
 	jboolean disableMenuAnimations, jboolean disableTheming, jboolean enableFontSmoothing, jboolean enableDesktopComposition)
 {
 	jni_freerdp_set_performance_flags(env, cls, instance, remotefx, disableWallpaper, disableFullWindowDrag, disableMenuAnimations, disableTheming, enableFontSmoothing, enableDesktopComposition);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1update_1graphics(
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(
 		JNIEnv *env, jclass cls, jint instance, jobject bitmap, jint x, jint y, jint width, jint height)
 {
 	return jni_freerdp_update_graphics(env, cls, instance, bitmap, x, y, width, height);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1cursor_1event(
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1cursor_1event(
 	JNIEnv *env, jclass cls, jint instance, jint x, jint y, jint flags)
 {
 	jni_freerdp_send_cursor_event(env, cls, instance, x, y, flags);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1key_1event(
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1key_1event(
 	JNIEnv *env, jclass cls, jint instance, jint keycode, jboolean down)
 {
 	jni_freerdp_send_key_event(env, cls, instance, keycode, down);
 }
 
-JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1unicodekey_1event
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1unicodekey_1event
   (JNIEnv *env, jclass cls, jint instance, jint keycode)
 {
 	jni_freerdp_send_unicodekey_event(env, cls, instance, keycode);
 }
 
-JNIEXPORT jstring JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1get_1version(JNIEnv *env, jclass cls)
+JNIEXPORT jstring JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1version(JNIEnv *env, jclass cls)
 {
 	return jni_freerdp_get_version(env, cls);
 }

client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.h

@@ -20,9 +20,9 @@
 #ifndef __ANDROID_FREERDP_JNI_H
 #define __ANDROID_FREERDP_JNI_H
 
-#include "com_freerdp_afreerdp_services_LibFreeRDP.h"
+#include "com_freerdp_freerdpcore_services_LibFreeRDP.h"
 
-#define JAVA_LIBFREERDP_CLASS "com/freerdp/afreerdp/services/LibFreeRDP"
+#define JAVA_LIBFREERDP_CLASS "com/freerdp/freerdpcore/services/LibFreeRDP"
 
 #endif /* __ANDROID_FREERDP_JNI_H */
 

client/Android/FreeRDPCore/jni/generated/com_freerdp_freerdpcore_services_LibFreeRDP.h

@@ -0,0 +1,125 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_freerdp_freerdpcore_services_LibFreeRDP */
+
+#ifndef _Included_com_freerdp_freerdpcore_services_LibFreeRDP
+#define _Included_com_freerdp_freerdpcore_services_LibFreeRDP
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_new
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_free
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_connect
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_disconnect
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_cancel_connection
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1cancel_1connection
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_set_connection_info
+ * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIZILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1connection_1info
+  (JNIEnv *, jclass, jint, jstring, jstring, jstring, jstring, jint, jint, jint, jint, jboolean, jint, jstring);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_set_performance_flags
+ * Signature: (IZZZZZZZ)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1performance_1flags
+  (JNIEnv *, jclass, jint, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_set_advanced_settings
+ * Signature: (ILjava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1advanced_1settings
+  (JNIEnv *, jclass, jint, jstring, jstring);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_set_data_directory
+ * Signature: (ILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1data_1directory
+  (JNIEnv *, jclass, jint, jstring);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_update_graphics
+ * Signature: (ILandroid/graphics/Bitmap;IIII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics
+  (JNIEnv *, jclass, jint, jobject, jint, jint, jint, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_send_cursor_event
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1cursor_1event
+  (JNIEnv *, jclass, jint, jint, jint, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_send_key_event
+ * Signature: (IIZ)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1key_1event
+  (JNIEnv *, jclass, jint, jint, jboolean);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_send_unicodekey_event
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1unicodekey_1event
+  (JNIEnv *, jclass, jint, jint);
+
+/*
+ * Class:     com_freerdp_freerdpcore_services_LibFreeRDP
+ * Method:    freerdp_get_version
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1version
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

client/Android/FreeRDPCore/project.properties

@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-8
+android.library=true