aFreeRDP: initial release

This is the initial release of aFreeRDP the FreeRDP Android client.
For build instructions have a look to docs/README.android.

CMakeLists.txt

@@ -58,13 +58,23 @@ if (FREERDP_VERSION_SUFFIX)
 else()
 	set(FREERDP_VERSION_FULL "${FREERDP_VERSION}")
 endif()
+
+# Allow to search the host machine for git
+if(ANDROID)
+	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, BOTH)
+endif(ANDROID)
 include(GetGitRevisionDescription)
+if(ANDROID)
+	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, ONLY)
+endif(ANDROID)
+
 git_describe(GIT_REVISION --match "[0-9]*" --abbrev=4 --tags --always)
 message(STATUS "Git Revision ${GIT_REVISION}")
 
 # Turn on solution folders (2.8.4+)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+
 # Default to release build type
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -183,6 +193,15 @@ if(APPLE)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.4")
 endif()
 
+# Android
+if(ANDROID)
+	if (NOT FREERDP_ANDROID_EXTERNAL_SSL_PATH)
+		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})
+endif()
+
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 if(NOT ANDROID)
 	find_package(Threads REQUIRED)
@@ -471,4 +490,13 @@ set(CPACK_COMPONENT_GROUP_RUNTIME_DESCRIPTION "Runtime")
 set(CPACK_COMPONENT_GROUP_APPLICATIONS_DESCRIPTION "Applications")
 set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "Development")
 
+# Workaround to remove c++ compiler macros and defines for Eclipse.
+# If c++ macros/defines are set __cplusplus is also set which causes
+# problems when compiling freerdp/jni. To prevent this problem
+# we set the macros to "".
+if (ANDROID AND CMAKE_EXTRA_GENERATOR STREQUAL "Eclipse CDT4")
+  set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "")
+  message(STATUS "Disabled CXX system defines for eclipse (workaround).")
+endif()
+
 include(CPack)

client/.gitignore

@@ -1,2 +1 @@
 iOS
-Android

client/Android/.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/.gitignore

@@ -0,0 +1,10 @@
+# Ignore directories
+bin/
+obj/
+gen/
+jni/external/*
+!libs
+libs/armeabi*
+AndroidManifest.xml
+local.properties
+!.project

client/Android/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>aFreeRDP</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/AndroidManifest.xml.cmake

@@ -0,0 +1,109 @@
+<?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=".application.GlobalApp"
+		android:label="aFreeRDP"
+		android:icon="@drawable/icon_launcher_freerdp" >
+
+			<!-- Main activity -->
+			<activity android:name=".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=".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=".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=".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">
+			</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>
+
+			<provider android:name=".services.FreeRDPSuggestionProvider"
+				android:authorities="com.freerdp.afreerdp.services.freerdpsuggestionprovider"
+				>
+			</provider>
+
+			<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/CMakeLists.txt

@@ -0,0 +1,64 @@
+# 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 "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)
+	find_program(ANT_COMMAND ant)
+  SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, ONLY)
+
+	if(ANT_COMMAND STREQUAL "ANT_COMMAND-NOTFOUND")
+		message(FATAL_ERROR "ant not found but required to build android java")
+	endif()
+
+  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()
+
+  # 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()