diff --git a/client/Android/FreeRDPCore/.classpath b/client/Android/FreeRDPCore/.classpath new file mode 100644 index 000000000..a4763d1ee --- /dev/null +++ b/client/Android/FreeRDPCore/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/client/Android/FreeRDPCore/.project b/client/Android/FreeRDPCore/.project new file mode 100644 index 000000000..85408c31b --- /dev/null +++ b/client/Android/FreeRDPCore/.project @@ -0,0 +1,33 @@ + + + FreeRDPCore + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/client/Android/CMakeLists.txt b/client/Android/FreeRDPCore/CMakeLists.txt similarity index 100% rename from client/Android/CMakeLists.txt rename to client/Android/FreeRDPCore/CMakeLists.txt diff --git a/client/Android/assets/about_page/FreeRDP_Logo.png b/client/Android/FreeRDPCore/assets/about_page/FreeRDP_Logo.png similarity index 100% rename from client/Android/assets/about_page/FreeRDP_Logo.png rename to client/Android/FreeRDPCore/assets/about_page/FreeRDP_Logo.png diff --git a/client/Android/assets/about_page/about.html b/client/Android/FreeRDPCore/assets/about_page/about.html similarity index 100% rename from client/Android/assets/about_page/about.html rename to client/Android/FreeRDPCore/assets/about_page/about.html diff --git a/client/Android/assets/about_page/about_phone.html b/client/Android/FreeRDPCore/assets/about_page/about_phone.html similarity index 100% rename from client/Android/assets/about_page/about_phone.html rename to client/Android/FreeRDPCore/assets/about_page/about_phone.html diff --git a/client/Android/assets/about_page/back.jpg b/client/Android/FreeRDPCore/assets/about_page/back.jpg similarity index 100% rename from client/Android/assets/about_page/back.jpg rename to client/Android/FreeRDPCore/assets/about_page/back.jpg diff --git a/client/Android/assets/about_page/background_transparent.png b/client/Android/FreeRDPCore/assets/about_page/background_transparent.png similarity index 100% rename from client/Android/assets/about_page/background_transparent.png rename to client/Android/FreeRDPCore/assets/about_page/background_transparent.png diff --git a/client/Android/assets/help_page/back.jpg b/client/Android/FreeRDPCore/assets/help_page/back.jpg similarity index 100% rename from client/Android/assets/help_page/back.jpg rename to client/Android/FreeRDPCore/assets/help_page/back.jpg diff --git a/client/Android/assets/help_page/gestures.html b/client/Android/FreeRDPCore/assets/help_page/gestures.html similarity index 100% rename from client/Android/assets/help_page/gestures.html rename to client/Android/FreeRDPCore/assets/help_page/gestures.html diff --git a/client/Android/assets/help_page/gestures.png b/client/Android/FreeRDPCore/assets/help_page/gestures.png similarity index 100% rename from client/Android/assets/help_page/gestures.png rename to client/Android/FreeRDPCore/assets/help_page/gestures.png diff --git a/client/Android/assets/help_page/gestures_phone.html b/client/Android/FreeRDPCore/assets/help_page/gestures_phone.html similarity index 100% rename from client/Android/assets/help_page/gestures_phone.html rename to client/Android/FreeRDPCore/assets/help_page/gestures_phone.html diff --git a/client/Android/assets/help_page/gestures_phone.png b/client/Android/FreeRDPCore/assets/help_page/gestures_phone.png similarity index 100% rename from client/Android/assets/help_page/gestures_phone.png rename to client/Android/FreeRDPCore/assets/help_page/gestures_phone.png diff --git a/client/Android/assets/help_page/nav_gestures.png b/client/Android/FreeRDPCore/assets/help_page/nav_gestures.png similarity index 100% rename from client/Android/assets/help_page/nav_gestures.png rename to client/Android/FreeRDPCore/assets/help_page/nav_gestures.png diff --git a/client/Android/assets/help_page/nav_toolbar.png b/client/Android/FreeRDPCore/assets/help_page/nav_toolbar.png similarity index 100% rename from client/Android/assets/help_page/nav_toolbar.png rename to client/Android/FreeRDPCore/assets/help_page/nav_toolbar.png diff --git a/client/Android/assets/help_page/nav_touch_pointer.png b/client/Android/FreeRDPCore/assets/help_page/nav_touch_pointer.png similarity index 100% rename from client/Android/assets/help_page/nav_touch_pointer.png rename to client/Android/FreeRDPCore/assets/help_page/nav_touch_pointer.png diff --git a/client/Android/assets/help_page/toolbar.html b/client/Android/FreeRDPCore/assets/help_page/toolbar.html similarity index 100% rename from client/Android/assets/help_page/toolbar.html rename to client/Android/FreeRDPCore/assets/help_page/toolbar.html diff --git a/client/Android/assets/help_page/toolbar.png b/client/Android/FreeRDPCore/assets/help_page/toolbar.png similarity index 100% rename from client/Android/assets/help_page/toolbar.png rename to client/Android/FreeRDPCore/assets/help_page/toolbar.png diff --git a/client/Android/assets/help_page/toolbar_phone.html b/client/Android/FreeRDPCore/assets/help_page/toolbar_phone.html similarity index 100% rename from client/Android/assets/help_page/toolbar_phone.html rename to client/Android/FreeRDPCore/assets/help_page/toolbar_phone.html diff --git a/client/Android/assets/help_page/toolbar_phone.png b/client/Android/FreeRDPCore/assets/help_page/toolbar_phone.png similarity index 100% rename from client/Android/assets/help_page/toolbar_phone.png rename to client/Android/FreeRDPCore/assets/help_page/toolbar_phone.png diff --git a/client/Android/assets/help_page/touch_pointer.html b/client/Android/FreeRDPCore/assets/help_page/touch_pointer.html similarity index 100% rename from client/Android/assets/help_page/touch_pointer.html rename to client/Android/FreeRDPCore/assets/help_page/touch_pointer.html diff --git a/client/Android/assets/help_page/touch_pointer.png b/client/Android/FreeRDPCore/assets/help_page/touch_pointer.png similarity index 100% rename from client/Android/assets/help_page/touch_pointer.png rename to client/Android/FreeRDPCore/assets/help_page/touch_pointer.png diff --git a/client/Android/assets/help_page/touch_pointer_phone.html b/client/Android/FreeRDPCore/assets/help_page/touch_pointer_phone.html similarity index 100% rename from client/Android/assets/help_page/touch_pointer_phone.html rename to client/Android/FreeRDPCore/assets/help_page/touch_pointer_phone.html diff --git a/client/Android/assets/help_page/touch_pointer_phone.png b/client/Android/FreeRDPCore/assets/help_page/touch_pointer_phone.png similarity index 100% rename from client/Android/assets/help_page/touch_pointer_phone.png rename to client/Android/FreeRDPCore/assets/help_page/touch_pointer_phone.png diff --git a/client/Android/assets/welcome_page/1.png b/client/Android/FreeRDPCore/assets/welcome_page/1.png similarity index 100% rename from client/Android/assets/welcome_page/1.png rename to client/Android/FreeRDPCore/assets/welcome_page/1.png diff --git a/client/Android/assets/welcome_page/2.png b/client/Android/FreeRDPCore/assets/welcome_page/2.png similarity index 100% rename from client/Android/assets/welcome_page/2.png rename to client/Android/FreeRDPCore/assets/welcome_page/2.png diff --git a/client/Android/assets/welcome_page/back.jpg b/client/Android/FreeRDPCore/assets/welcome_page/back.jpg similarity index 100% rename from client/Android/assets/welcome_page/back.jpg rename to client/Android/FreeRDPCore/assets/welcome_page/back.jpg diff --git a/client/Android/assets/welcome_page/new_connection.png b/client/Android/FreeRDPCore/assets/welcome_page/new_connection.png similarity index 100% rename from client/Android/assets/welcome_page/new_connection.png rename to client/Android/FreeRDPCore/assets/welcome_page/new_connection.png diff --git a/client/Android/assets/welcome_page/welcome.html b/client/Android/FreeRDPCore/assets/welcome_page/welcome.html similarity index 100% rename from client/Android/assets/welcome_page/welcome.html rename to client/Android/FreeRDPCore/assets/welcome_page/welcome.html diff --git a/client/Android/assets/welcome_page/welcome_phone.html b/client/Android/FreeRDPCore/assets/welcome_page/welcome_phone.html similarity index 100% rename from client/Android/assets/welcome_page/welcome_phone.html rename to client/Android/FreeRDPCore/assets/welcome_page/welcome_phone.html diff --git a/client/Android/jni/CMakeLists.txt b/client/Android/FreeRDPCore/jni/CMakeLists.txt similarity index 100% rename from client/Android/jni/CMakeLists.txt rename to client/Android/FreeRDPCore/jni/CMakeLists.txt diff --git a/client/Android/jni/android_debug.h b/client/Android/FreeRDPCore/jni/android_debug.h similarity index 100% rename from client/Android/jni/android_debug.h rename to client/Android/FreeRDPCore/jni/android_debug.h diff --git a/client/Android/jni/android_event.c b/client/Android/FreeRDPCore/jni/android_event.c similarity index 100% rename from client/Android/jni/android_event.c rename to client/Android/FreeRDPCore/jni/android_event.c diff --git a/client/Android/jni/android_event.h b/client/Android/FreeRDPCore/jni/android_event.h similarity index 100% rename from client/Android/jni/android_event.h rename to client/Android/FreeRDPCore/jni/android_event.h diff --git a/client/Android/jni/android_freerdp.c b/client/Android/FreeRDPCore/jni/android_freerdp.c similarity index 100% rename from client/Android/jni/android_freerdp.c rename to client/Android/FreeRDPCore/jni/android_freerdp.c diff --git a/client/Android/jni/android_freerdp.h b/client/Android/FreeRDPCore/jni/android_freerdp.h similarity index 100% rename from client/Android/jni/android_freerdp.h rename to client/Android/FreeRDPCore/jni/android_freerdp.h diff --git a/client/Android/jni/android_jni_callback.c b/client/Android/FreeRDPCore/jni/android_jni_callback.c similarity index 100% rename from client/Android/jni/android_jni_callback.c rename to client/Android/FreeRDPCore/jni/android_jni_callback.c diff --git a/client/Android/jni/android_jni_callback.h b/client/Android/FreeRDPCore/jni/android_jni_callback.h similarity index 100% rename from client/Android/jni/android_jni_callback.h rename to client/Android/FreeRDPCore/jni/android_jni_callback.h diff --git a/client/Android/jni/generated/android_freerdp_jni.c b/client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.c similarity index 59% rename from client/Android/jni/generated/android_freerdp_jni.c rename to client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.c index 8d64e094c..308c146cb 100644 --- a/client/Android/jni/generated/android_freerdp_jni.c +++ b/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); } diff --git a/client/Android/jni/generated/android_freerdp_jni.h b/client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.h similarity index 91% rename from client/Android/jni/generated/android_freerdp_jni.h rename to client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.h index a10d17cc6..fd5c82c32 100644 --- a/client/Android/jni/generated/android_freerdp_jni.h +++ b/client/Android/FreeRDPCore/jni/generated/android_freerdp_jni.h @@ -22,7 +22,7 @@ #include "com_freerdp_afreerdp_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 */ diff --git a/client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h b/client/Android/FreeRDPCore/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h similarity index 67% rename from client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h rename to client/Android/FreeRDPCore/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h index cfe8d65f5..9d33c08dd 100644 --- a/client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h +++ b/client/Android/FreeRDPCore/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h @@ -12,7 +12,7 @@ extern "C" { * Method: freerdp_new * Signature: ()I */ -JNIEXPORT jint JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1new +JNIEXPORT jint JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new (JNIEnv *, jclass); /* @@ -20,7 +20,7 @@ JNIEXPORT jint JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1ne * Method: freerdp_free * Signature: (I)V */ -JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1free +JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free (JNIEnv *, jclass, jint); /* @@ -28,7 +28,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1fr * Method: freerdp_connect * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1connect +JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect (JNIEnv *, jclass, jint); /* @@ -36,7 +36,7 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp * Method: freerdp_disconnect * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1disconnect +JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect (JNIEnv *, jclass, jint); /* @@ -44,7 +44,7 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp * Method: freerdp_cancel_connection * Signature: (I)V */ -JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1cancel_1connection +JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1cancel_1connection (JNIEnv *, jclass, jint); /* @@ -52,7 +52,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1ca * 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_afreerdp_services_LibFreeRDP_freerdp_1set_1connection_1info +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); /* @@ -60,7 +60,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_set_performance_flags * Signature: (IZZZZZZZ)V */ -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 *, jclass, jint, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean); /* @@ -68,7 +68,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_set_advanced_settings * Signature: (ILjava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1advanced_1settings +JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1advanced_1settings (JNIEnv *, jclass, jint, jstring, jstring); /* @@ -76,7 +76,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_set_data_directory * Signature: (ILjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1data_1directory +JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1set_1data_1directory (JNIEnv *, jclass, jint, jstring); /* @@ -84,7 +84,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_update_graphics * Signature: (ILandroid/graphics/Bitmap;IIII)Z */ -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 *, jclass, jint, jobject, jint, jint, jint, jint); /* @@ -92,7 +92,7 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp * Method: freerdp_send_cursor_event * Signature: (IIII)V */ -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 *, jclass, jint, jint, jint, jint); /* @@ -100,7 +100,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_send_key_event * Signature: (IIZ)V */ -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 *, jclass, jint, jint, jboolean); /* @@ -108,7 +108,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_send_unicodekey_event * Signature: (II)V */ -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 *, jclass, jint, jint); /* @@ -116,7 +116,7 @@ JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1se * Method: freerdp_get_version * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1get_1version +JNIEXPORT jstring JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1version (JNIEnv *, jclass); #ifdef __cplusplus diff --git a/client/Android/FreeRDPCore/proguard-project.txt b/client/Android/FreeRDPCore/proguard-project.txt new file mode 100644 index 000000000..f2fe1559a --- /dev/null +++ b/client/Android/FreeRDPCore/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/client/Android/FreeRDPCore/project.properties b/client/Android/FreeRDPCore/project.properties new file mode 100644 index 000000000..db721fd89 --- /dev/null +++ b/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 diff --git a/client/Android/res/drawable-hdpi/icon_button_add.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_button_add.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_button_add.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_button_add.png diff --git a/client/Android/res/drawable-hdpi/icon_edittext_clear.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_edittext_clear.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_edittext_clear.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_edittext_clear.png diff --git a/client/Android/res/drawable-hdpi/icon_edittext_search.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_edittext_search.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_edittext_search.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_edittext_search.png diff --git a/client/Android/res/drawable-hdpi/icon_launcher_freerdp.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_launcher_freerdp.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_launcher_freerdp.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_launcher_freerdp.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_about.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_about.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_about.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_about.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_add.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_add.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_add.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_add.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_close.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_close.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_close.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_close.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_disconnect.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_disconnect.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_disconnect.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_disconnect.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_ext_keyboard.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_ext_keyboard.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_ext_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_ext_keyboard.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_help.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_help.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_help.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_help.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_preferences.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_preferences.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_preferences.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_preferences.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_settings.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_settings.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_settings.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_settings.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_sys_keyboard.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_sys_keyboard.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_sys_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_sys_keyboard.png diff --git a/client/Android/res/drawable-hdpi/icon_menu_touch_pointer.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_touch_pointer.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_menu_touch_pointer.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_menu_touch_pointer.png diff --git a/client/Android/res/drawable-hdpi/icon_star_off.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_star_off.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_star_off.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_star_off.png diff --git a/client/Android/res/drawable-hdpi/icon_star_on.png b/client/Android/FreeRDPCore/res/drawable-hdpi/icon_star_on.png similarity index 100% rename from client/Android/res/drawable-hdpi/icon_star_on.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/icon_star_on.png diff --git a/client/Android/res/drawable-hdpi/search_plate.9.png b/client/Android/FreeRDPCore/res/drawable-hdpi/search_plate.9.png similarity index 100% rename from client/Android/res/drawable-hdpi/search_plate.9.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/search_plate.9.png diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_delete.png b/client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_delete.png similarity index 100% rename from client/Android/res/drawable-hdpi/sym_keyboard_delete.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_delete.png diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_feedback_delete.png similarity index 100% rename from client/Android/res/drawable-hdpi/sym_keyboard_feedback_delete.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_feedback_delete.png diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_feedback_return.png b/client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_feedback_return.png similarity index 100% rename from client/Android/res/drawable-hdpi/sym_keyboard_feedback_return.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_feedback_return.png diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_return.png b/client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_return.png similarity index 100% rename from client/Android/res/drawable-hdpi/sym_keyboard_return.png rename to client/Android/FreeRDPCore/res/drawable-hdpi/sym_keyboard_return.png diff --git a/client/Android/res/drawable-ldpi/icon_button_add.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_button_add.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_button_add.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_button_add.png diff --git a/client/Android/res/drawable-ldpi/icon_edittext_search.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_edittext_search.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_edittext_search.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_edittext_search.png diff --git a/client/Android/res/drawable-ldpi/icon_launcher_freerdp.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_launcher_freerdp.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_launcher_freerdp.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_launcher_freerdp.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_about.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_about.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_about.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_about.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_add.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_add.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_add.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_add.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_disconnect.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_disconnect.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_disconnect.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_disconnect.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_exit.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_exit.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_exit.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_exit.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_ext_keyboard.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_ext_keyboard.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_ext_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_ext_keyboard.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_help.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_help.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_help.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_help.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_preferences.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_preferences.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_preferences.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_preferences.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_settings.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_settings.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_settings.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_settings.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_sys_keyboard.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_sys_keyboard.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_sys_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_sys_keyboard.png diff --git a/client/Android/res/drawable-ldpi/icon_menu_touch_pointer.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_touch_pointer.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_menu_touch_pointer.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_menu_touch_pointer.png diff --git a/client/Android/res/drawable-ldpi/icon_star_off.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_star_off.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_star_off.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_star_off.png diff --git a/client/Android/res/drawable-ldpi/icon_star_on.png b/client/Android/FreeRDPCore/res/drawable-ldpi/icon_star_on.png similarity index 100% rename from client/Android/res/drawable-ldpi/icon_star_on.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/icon_star_on.png diff --git a/client/Android/res/drawable-ldpi/search_plate.9.png b/client/Android/FreeRDPCore/res/drawable-ldpi/search_plate.9.png similarity index 100% rename from client/Android/res/drawable-ldpi/search_plate.9.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/search_plate.9.png diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_delete.png b/client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_delete.png similarity index 100% rename from client/Android/res/drawable-ldpi/sym_keyboard_delete.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_delete.png diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_feedback_delete.png b/client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_feedback_delete.png similarity index 100% rename from client/Android/res/drawable-ldpi/sym_keyboard_feedback_delete.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_feedback_delete.png diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_feedback_return.png b/client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_feedback_return.png similarity index 100% rename from client/Android/res/drawable-ldpi/sym_keyboard_feedback_return.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_feedback_return.png diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_return.png b/client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_return.png similarity index 100% rename from client/Android/res/drawable-ldpi/sym_keyboard_return.png rename to client/Android/FreeRDPCore/res/drawable-ldpi/sym_keyboard_return.png diff --git a/client/Android/res/drawable-mdpi/icon_button_add.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_button_add.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_button_add.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_button_add.png diff --git a/client/Android/res/drawable-mdpi/icon_edittext_clear.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_edittext_clear.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_edittext_clear.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_edittext_clear.png diff --git a/client/Android/res/drawable-mdpi/icon_edittext_search.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_edittext_search.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_edittext_search.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_edittext_search.png diff --git a/client/Android/res/drawable-mdpi/icon_launcher_freerdp.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_launcher_freerdp.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_launcher_freerdp.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_launcher_freerdp.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_about.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_about.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_about.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_about.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_add.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_add.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_add.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_add.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_disconnect.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_disconnect.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_disconnect.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_disconnect.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_exit.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_exit.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_exit.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_exit.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_ext_keyboard.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_ext_keyboard.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_ext_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_ext_keyboard.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_help.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_help.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_help.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_help.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_preferences.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_preferences.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_preferences.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_preferences.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_settings.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_settings.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_settings.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_settings.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_sys_keyboard.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_sys_keyboard.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_sys_keyboard.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_sys_keyboard.png diff --git a/client/Android/res/drawable-mdpi/icon_menu_touch_pointer.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_touch_pointer.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_menu_touch_pointer.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_menu_touch_pointer.png diff --git a/client/Android/res/drawable-mdpi/icon_star_off.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_star_off.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_star_off.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_star_off.png diff --git a/client/Android/res/drawable-mdpi/icon_star_on.png b/client/Android/FreeRDPCore/res/drawable-mdpi/icon_star_on.png similarity index 100% rename from client/Android/res/drawable-mdpi/icon_star_on.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/icon_star_on.png diff --git a/client/Android/res/drawable-mdpi/search_plate.9.png b/client/Android/FreeRDPCore/res/drawable-mdpi/search_plate.9.png similarity index 100% rename from client/Android/res/drawable-mdpi/search_plate.9.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/search_plate.9.png diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_delete.png b/client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_delete.png similarity index 100% rename from client/Android/res/drawable-mdpi/sym_keyboard_delete.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_delete.png diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_feedback_delete.png similarity index 100% rename from client/Android/res/drawable-mdpi/sym_keyboard_feedback_delete.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_feedback_delete.png diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_feedback_return.png b/client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_feedback_return.png similarity index 100% rename from client/Android/res/drawable-mdpi/sym_keyboard_feedback_return.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_feedback_return.png diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_return.png b/client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_return.png similarity index 100% rename from client/Android/res/drawable-mdpi/sym_keyboard_return.png rename to client/Android/FreeRDPCore/res/drawable-mdpi/sym_keyboard_return.png diff --git a/client/Android/res/drawable/button_background.xml b/client/Android/FreeRDPCore/res/drawable/button_background.xml similarity index 100% rename from client/Android/res/drawable/button_background.xml rename to client/Android/FreeRDPCore/res/drawable/button_background.xml diff --git a/client/Android/res/drawable/icon_button_cancel.png b/client/Android/FreeRDPCore/res/drawable/icon_button_cancel.png similarity index 100% rename from client/Android/res/drawable/icon_button_cancel.png rename to client/Android/FreeRDPCore/res/drawable/icon_button_cancel.png diff --git a/client/Android/res/drawable/icon_launcher_freerdp.png b/client/Android/FreeRDPCore/res/drawable/icon_launcher_freerdp.png similarity index 100% rename from client/Android/res/drawable/icon_launcher_freerdp.png rename to client/Android/FreeRDPCore/res/drawable/icon_launcher_freerdp.png diff --git a/client/Android/res/drawable/separator_background.xml b/client/Android/FreeRDPCore/res/drawable/separator_background.xml similarity index 100% rename from client/Android/res/drawable/separator_background.xml rename to client/Android/FreeRDPCore/res/drawable/separator_background.xml diff --git a/client/Android/res/drawable/sym_keyboard_arrows.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_arrows.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_arrows.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_arrows.png diff --git a/client/Android/res/drawable/sym_keyboard_arrows_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_arrows_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_arrows_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_arrows_black.png diff --git a/client/Android/res/drawable/sym_keyboard_down_arrow.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_down_arrow.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_down_arrow.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_down_arrow.png diff --git a/client/Android/res/drawable/sym_keyboard_down_arrow_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_down_arrow_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_down_arrow_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_down_arrow_black.png diff --git a/client/Android/res/drawable/sym_keyboard_left_arrow.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_left_arrow.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_left_arrow.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_left_arrow.png diff --git a/client/Android/res/drawable/sym_keyboard_left_arrow_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_left_arrow_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_left_arrow_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_left_arrow_black.png diff --git a/client/Android/res/drawable/sym_keyboard_menu.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_menu.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_menu.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_menu.png diff --git a/client/Android/res/drawable/sym_keyboard_menu_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_menu_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_menu_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_menu_black.png diff --git a/client/Android/res/drawable/sym_keyboard_right_arrow.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_right_arrow.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_right_arrow.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_right_arrow.png diff --git a/client/Android/res/drawable/sym_keyboard_right_arrow_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_right_arrow_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_right_arrow_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_right_arrow_black.png diff --git a/client/Android/res/drawable/sym_keyboard_up_arrow.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_up_arrow.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_up_arrow.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_up_arrow.png diff --git a/client/Android/res/drawable/sym_keyboard_up_arrow_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_up_arrow_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_up_arrow_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_up_arrow_black.png diff --git a/client/Android/res/drawable/sym_keyboard_winkey.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_winkey.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_winkey.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_winkey.png diff --git a/client/Android/res/drawable/sym_keyboard_winkey_black.png b/client/Android/FreeRDPCore/res/drawable/sym_keyboard_winkey_black.png similarity index 100% rename from client/Android/res/drawable/sym_keyboard_winkey_black.png rename to client/Android/FreeRDPCore/res/drawable/sym_keyboard_winkey_black.png diff --git a/client/Android/res/drawable/touch_pointer_active.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_active.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_active.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_active.png diff --git a/client/Android/res/drawable/touch_pointer_default.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_default.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_default.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_default.png diff --git a/client/Android/res/drawable/touch_pointer_extkeyboard.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_extkeyboard.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_extkeyboard.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_extkeyboard.png diff --git a/client/Android/res/drawable/touch_pointer_keyboard.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_keyboard.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_keyboard.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_keyboard.png diff --git a/client/Android/res/drawable/touch_pointer_lclick.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_lclick.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_lclick.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_lclick.png diff --git a/client/Android/res/drawable/touch_pointer_rclick.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_rclick.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_rclick.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_rclick.png diff --git a/client/Android/res/drawable/touch_pointer_reset.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_reset.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_reset.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_reset.png diff --git a/client/Android/res/drawable/touch_pointer_scroll.png b/client/Android/FreeRDPCore/res/drawable/touch_pointer_scroll.png similarity index 100% rename from client/Android/res/drawable/touch_pointer_scroll.png rename to client/Android/FreeRDPCore/res/drawable/touch_pointer_scroll.png diff --git a/client/Android/res/layout/bookmark_list_item.xml b/client/Android/FreeRDPCore/res/layout/bookmark_list_item.xml similarity index 100% rename from client/Android/res/layout/bookmark_list_item.xml rename to client/Android/FreeRDPCore/res/layout/bookmark_list_item.xml diff --git a/client/Android/res/layout/button_preference.xml b/client/Android/FreeRDPCore/res/layout/button_preference.xml similarity index 100% rename from client/Android/res/layout/button_preference.xml rename to client/Android/FreeRDPCore/res/layout/button_preference.xml diff --git a/client/Android/res/layout/credentials.xml b/client/Android/FreeRDPCore/res/layout/credentials.xml similarity index 100% rename from client/Android/res/layout/credentials.xml rename to client/Android/FreeRDPCore/res/layout/credentials.xml diff --git a/client/Android/res/layout/dont_show_again_dialog.xml b/client/Android/FreeRDPCore/res/layout/dont_show_again_dialog.xml similarity index 100% rename from client/Android/res/layout/dont_show_again_dialog.xml rename to client/Android/FreeRDPCore/res/layout/dont_show_again_dialog.xml diff --git a/client/Android/res/layout/home.xml b/client/Android/FreeRDPCore/res/layout/home.xml similarity index 100% rename from client/Android/res/layout/home.xml rename to client/Android/FreeRDPCore/res/layout/home.xml diff --git a/client/Android/res/layout/list_header.xml b/client/Android/FreeRDPCore/res/layout/list_header.xml similarity index 100% rename from client/Android/res/layout/list_header.xml rename to client/Android/FreeRDPCore/res/layout/list_header.xml diff --git a/client/Android/res/layout/session.xml b/client/Android/FreeRDPCore/res/layout/session.xml similarity index 100% rename from client/Android/res/layout/session.xml rename to client/Android/FreeRDPCore/res/layout/session.xml diff --git a/client/Android/res/layout/session_list_item.xml b/client/Android/FreeRDPCore/res/layout/session_list_item.xml similarity index 100% rename from client/Android/res/layout/session_list_item.xml rename to client/Android/FreeRDPCore/res/layout/session_list_item.xml diff --git a/client/Android/res/layout/super_bar.xml b/client/Android/FreeRDPCore/res/layout/super_bar.xml similarity index 100% rename from client/Android/res/layout/super_bar.xml rename to client/Android/FreeRDPCore/res/layout/super_bar.xml diff --git a/client/Android/res/menu/bookmark_context_menu.xml b/client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml similarity index 100% rename from client/Android/res/menu/bookmark_context_menu.xml rename to client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml diff --git a/client/Android/res/menu/home_menu.xml b/client/Android/FreeRDPCore/res/menu/home_menu.xml similarity index 99% rename from client/Android/res/menu/home_menu.xml rename to client/Android/FreeRDPCore/res/menu/home_menu.xml index 6611b04d8..21fd280e8 100644 --- a/client/Android/res/menu/home_menu.xml +++ b/client/Android/FreeRDPCore/res/menu/home_menu.xml @@ -20,5 +20,5 @@ + /> diff --git a/client/Android/res/menu/session_menu.xml b/client/Android/FreeRDPCore/res/menu/session_menu.xml similarity index 100% rename from client/Android/res/menu/session_menu.xml rename to client/Android/FreeRDPCore/res/menu/session_menu.xml diff --git a/client/Android/res/values-land/dimens.xml b/client/Android/FreeRDPCore/res/values-land/dimens.xml similarity index 100% rename from client/Android/res/values-land/dimens.xml rename to client/Android/FreeRDPCore/res/values-land/dimens.xml diff --git a/client/Android/res/values/attrs.xml b/client/Android/FreeRDPCore/res/values/attrs.xml similarity index 100% rename from client/Android/res/values/attrs.xml rename to client/Android/FreeRDPCore/res/values/attrs.xml diff --git a/client/Android/res/values/dimens.xml b/client/Android/FreeRDPCore/res/values/dimens.xml similarity index 100% rename from client/Android/res/values/dimens.xml rename to client/Android/FreeRDPCore/res/values/dimens.xml diff --git a/client/Android/res/values/integers.xml b/client/Android/FreeRDPCore/res/values/integers.xml similarity index 100% rename from client/Android/res/values/integers.xml rename to client/Android/FreeRDPCore/res/values/integers.xml diff --git a/client/Android/res/values/strings.xml b/client/Android/FreeRDPCore/res/values/strings.xml similarity index 100% rename from client/Android/res/values/strings.xml rename to client/Android/FreeRDPCore/res/values/strings.xml diff --git a/client/Android/res/values/theme.xml b/client/Android/FreeRDPCore/res/values/theme.xml similarity index 100% rename from client/Android/res/values/theme.xml rename to client/Android/FreeRDPCore/res/values/theme.xml diff --git a/client/Android/res/xml/advanced_settings.xml b/client/Android/FreeRDPCore/res/xml/advanced_settings.xml similarity index 100% rename from client/Android/res/xml/advanced_settings.xml rename to client/Android/FreeRDPCore/res/xml/advanced_settings.xml diff --git a/client/Android/res/xml/application_settings.xml b/client/Android/FreeRDPCore/res/xml/application_settings.xml similarity index 95% rename from client/Android/res/xml/application_settings.xml rename to client/Android/FreeRDPCore/res/xml/application_settings.xml index 314b2acb9..4211650df 100644 --- a/client/Android/res/xml/application_settings.xml +++ b/client/Android/FreeRDPCore/res/xml/application_settings.xml @@ -9,7 +9,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ --> - + diff --git a/client/Android/res/xml/bookmark_settings.xml b/client/Android/FreeRDPCore/res/xml/bookmark_settings.xml similarity index 97% rename from client/Android/res/xml/bookmark_settings.xml rename to client/Android/FreeRDPCore/res/xml/bookmark_settings.xml index 86df480ad..dcae89f3b 100644 --- a/client/Android/res/xml/bookmark_settings.xml +++ b/client/Android/FreeRDPCore/res/xml/bookmark_settings.xml @@ -9,7 +9,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ --> - + diff --git a/client/Android/res/xml/credentials_settings.xml b/client/Android/FreeRDPCore/res/xml/credentials_settings.xml similarity index 100% rename from client/Android/res/xml/credentials_settings.xml rename to client/Android/FreeRDPCore/res/xml/credentials_settings.xml diff --git a/client/Android/res/xml/cursor_keyboard.xml b/client/Android/FreeRDPCore/res/xml/cursor_keyboard.xml similarity index 100% rename from client/Android/res/xml/cursor_keyboard.xml rename to client/Android/FreeRDPCore/res/xml/cursor_keyboard.xml diff --git a/client/Android/res/xml/modifiers_keyboard.xml b/client/Android/FreeRDPCore/res/xml/modifiers_keyboard.xml similarity index 100% rename from client/Android/res/xml/modifiers_keyboard.xml rename to client/Android/FreeRDPCore/res/xml/modifiers_keyboard.xml diff --git a/client/Android/res/xml/numpad_keyboard.xml b/client/Android/FreeRDPCore/res/xml/numpad_keyboard.xml similarity index 100% rename from client/Android/res/xml/numpad_keyboard.xml rename to client/Android/FreeRDPCore/res/xml/numpad_keyboard.xml diff --git a/client/Android/res/xml/performance_flags.xml b/client/Android/FreeRDPCore/res/xml/performance_flags.xml similarity index 100% rename from client/Android/res/xml/performance_flags.xml rename to client/Android/FreeRDPCore/res/xml/performance_flags.xml diff --git a/client/Android/res/xml/performance_flags_3g.xml b/client/Android/FreeRDPCore/res/xml/performance_flags_3g.xml similarity index 100% rename from client/Android/res/xml/performance_flags_3g.xml rename to client/Android/FreeRDPCore/res/xml/performance_flags_3g.xml diff --git a/client/Android/res/xml/screen_settings.xml b/client/Android/FreeRDPCore/res/xml/screen_settings.xml similarity index 94% rename from client/Android/res/xml/screen_settings.xml rename to client/Android/FreeRDPCore/res/xml/screen_settings.xml index 589a35a8d..f684d1691 100644 --- a/client/Android/res/xml/screen_settings.xml +++ b/client/Android/FreeRDPCore/res/xml/screen_settings.xml @@ -9,7 +9,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ --> - + diff --git a/client/Android/res/xml/screen_settings_3g.xml b/client/Android/FreeRDPCore/res/xml/screen_settings_3g.xml similarity index 94% rename from client/Android/res/xml/screen_settings_3g.xml rename to client/Android/FreeRDPCore/res/xml/screen_settings_3g.xml index de750855c..d34634e88 100644 --- a/client/Android/res/xml/screen_settings_3g.xml +++ b/client/Android/FreeRDPCore/res/xml/screen_settings_3g.xml @@ -9,7 +9,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ --> - + diff --git a/client/Android/res/xml/searchable.xml b/client/Android/FreeRDPCore/res/xml/searchable.xml similarity index 100% rename from client/Android/res/xml/searchable.xml rename to client/Android/FreeRDPCore/res/xml/searchable.xml diff --git a/client/Android/res/xml/specialkeys_keyboard.xml b/client/Android/FreeRDPCore/res/xml/specialkeys_keyboard.xml similarity index 100% rename from client/Android/res/xml/specialkeys_keyboard.xml rename to client/Android/FreeRDPCore/res/xml/specialkeys_keyboard.xml diff --git a/client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalApp.java similarity index 93% rename from client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalApp.java index 4fd849c21..c37f8df5a 100644 --- a/client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalApp.java @@ -7,7 +7,7 @@ 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.afreerdp.application; +package com.freerdp.freerdpcore.application; import android.app.Application; import android.content.Intent; @@ -16,13 +16,13 @@ import android.util.Log; import java.util.*; -import com.freerdp.afreerdp.application.SessionState; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.services.BookmarkDB; -import com.freerdp.afreerdp.services.HistoryDB; -import com.freerdp.afreerdp.services.LibFreeRDP; -import com.freerdp.afreerdp.services.ManualBookmarkGateway; -import com.freerdp.afreerdp.services.QuickConnectHistoryGateway; +import com.freerdp.freerdpcore.application.SessionState; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.services.BookmarkDB; +import com.freerdp.freerdpcore.services.HistoryDB; +import com.freerdp.freerdpcore.services.LibFreeRDP; +import com.freerdp.freerdpcore.services.ManualBookmarkGateway; +import com.freerdp.freerdpcore.services.QuickConnectHistoryGateway; public class GlobalApp extends Application implements LibFreeRDP.EventListener { diff --git a/client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalSettings.java similarity index 98% rename from client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalSettings.java index 48ef10fbb..5b876dd94 100644 --- a/client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/GlobalSettings.java @@ -7,7 +7,7 @@ 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.afreerdp.application; +package com.freerdp.freerdpcore.application; import android.content.Context; import android.content.SharedPreferences; diff --git a/client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/NetworkStateReceiver.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/NetworkStateReceiver.java index 24a7ff990..86f9f075e 100644 --- a/client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/NetworkStateReceiver.java @@ -7,7 +7,7 @@ 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.afreerdp.application; +package com.freerdp.freerdpcore.application; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/ScreenReceiver.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/ScreenReceiver.java index d2d74286e..25c392c7e 100644 --- a/client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/ScreenReceiver.java @@ -7,7 +7,7 @@ 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.afreerdp.application; +package com.freerdp.freerdpcore.application; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/client/Android/src/com/freerdp/afreerdp/application/SessionState.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/SessionState.java similarity index 93% rename from client/Android/src/com/freerdp/afreerdp/application/SessionState.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/SessionState.java index 18d19f232..fe213fb4f 100644 --- a/client/Android/src/com/freerdp/afreerdp/application/SessionState.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/application/SessionState.java @@ -7,15 +7,15 @@ 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.afreerdp.application; +package com.freerdp.freerdpcore.application; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.os.Parcel; import android.os.Parcelable; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.services.LibFreeRDP; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.services.LibFreeRDP; public class SessionState implements Parcelable { diff --git a/client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java index dc73872e1..12828ffd4 100644 --- a/client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java @@ -7,9 +7,9 @@ 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.afreerdp.domain; +package com.freerdp.freerdpcore.domain; -import com.freerdp.afreerdp.application.GlobalApp; +import com.freerdp.freerdpcore.application.GlobalApp; import android.content.SharedPreferences; import android.os.Parcel; diff --git a/client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ConnectionReference.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ConnectionReference.java index 7975f795e..270139c51 100644 --- a/client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ConnectionReference.java @@ -7,7 +7,7 @@ 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.afreerdp.domain; +package com.freerdp.freerdpcore.domain; public class ConnectionReference { diff --git a/client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ManualBookmark.java similarity index 98% rename from client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ManualBookmark.java index 4d749c5a1..81d9b717c 100644 --- a/client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/ManualBookmark.java @@ -7,7 +7,7 @@ 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.afreerdp.domain; +package com.freerdp.freerdpcore.domain; import android.content.SharedPreferences; import android.os.Parcel; diff --git a/client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/PlaceholderBookmark.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/PlaceholderBookmark.java index 54b08d431..b6712ec02 100644 --- a/client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/PlaceholderBookmark.java @@ -7,7 +7,7 @@ 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.afreerdp.domain; +package com.freerdp.freerdpcore.domain; import android.content.SharedPreferences; import android.os.Parcel; diff --git a/client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/QuickConnectBookmark.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/QuickConnectBookmark.java index 1f6780c26..396853989 100644 --- a/client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/QuickConnectBookmark.java @@ -7,7 +7,7 @@ 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.afreerdp.domain; +package com.freerdp.freerdpcore.domain; import android.content.SharedPreferences; import android.os.Parcel; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/AboutActivity.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/AboutActivity.java index f5a525b37..dc030c977 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/AboutActivity.java @@ -7,14 +7,14 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.IllegalFormatException; -import com.freerdp.afreerdp.services.LibFreeRDP; +import com.freerdp.freerdpcore.services.LibFreeRDP; import android.app.Activity; import android.content.pm.PackageManager.NameNotFoundException; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ApplicationSettingsActivity.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ApplicationSettingsActivity.java index 6dd387de3..3b99ee240 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ApplicationSettingsActivity.java @@ -7,11 +7,11 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.io.File; -import com.freerdp.afreerdp.R; +import com.freerdp.freerdpcore.R; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java index 40ebeddfa..ce5a830a2 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java @@ -7,14 +7,14 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.domain.ManualBookmark; -import com.freerdp.afreerdp.services.BookmarkBaseGateway; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.domain.ManualBookmark; +import com.freerdp.freerdpcore.services.BookmarkBaseGateway; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HelpActivity.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HelpActivity.java index 07f6cc9d4..2b526faee 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HelpActivity.java @@ -7,7 +7,7 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import android.app.Activity; import android.content.res.Configuration; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java similarity index 80% rename from client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java index 62fff1d98..8abd471c9 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java @@ -7,19 +7,19 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.util.ArrayList; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.application.GlobalSettings; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.domain.PlaceholderBookmark; -import com.freerdp.afreerdp.domain.QuickConnectBookmark; -import com.freerdp.afreerdp.utils.BookmarkArrayAdapter; -import com.freerdp.afreerdp.utils.SeparatedListAdapter; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.application.GlobalSettings; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.domain.PlaceholderBookmark; +import com.freerdp.freerdpcore.domain.QuickConnectBookmark; +import com.freerdp.freerdpcore.utils.BookmarkArrayAdapter; +import com.freerdp.freerdpcore.utils.SeparatedListAdapter; import android.app.Activity; import android.app.AlertDialog; @@ -185,52 +185,49 @@ public class HomeActivity extends Activity // get connection reference AdapterContextMenuInfo menuInfo = (AdapterContextMenuInfo)aItem.getMenuInfo(); String refStr = menuInfo.targetView.getTag().toString(); - - switch(aItem.getItemId()) { - - case R.id.bookmark_connect: + + // refer to http://tools.android.com/tips/non-constant-fields why we can't use switch/case here .. + int itemId = aItem.getItemId(); + if (itemId == R.id.bookmark_connect) + { + Bundle bundle = new Bundle(); + bundle.putString(SessionActivity.PARAM_CONNECTION_REFERENCE, refStr); + Intent sessionIntent = new Intent(this, SessionActivity.class); + sessionIntent.putExtras(bundle); + + startActivity(sessionIntent); + return true; + } + else if (itemId == R.id.bookmark_edit) + { + Bundle bundle = new Bundle(); + bundle.putString(BookmarkActivity.PARAM_CONNECTION_REFERENCE, refStr); + + Intent bookmarkIntent = new Intent(this.getApplicationContext(), BookmarkActivity.class); + bookmarkIntent.putExtras(bundle); + startActivity(bookmarkIntent); + return true; + } + else if (itemId == R.id.bookmark_delete) + { + if(ConnectionReference.isManualBookmarkReference(refStr)) { - Bundle bundle = new Bundle(); - bundle.putString(SessionActivity.PARAM_CONNECTION_REFERENCE, refStr); - Intent sessionIntent = new Intent(this, SessionActivity.class); - sessionIntent.putExtras(bundle); - - startActivity(sessionIntent); - return true; + long id = ConnectionReference.getManualBookmarkId(refStr); + GlobalApp.getManualBookmarkGateway().delete(id); + manualBookmarkAdapter.remove(id); + separatedListAdapter.notifyDataSetChanged(); + } + else + { + assert false; } - case R.id.bookmark_edit: - { - Bundle bundle = new Bundle(); - bundle.putString(BookmarkActivity.PARAM_CONNECTION_REFERENCE, refStr); - - Intent bookmarkIntent = new Intent(this.getApplicationContext(), BookmarkActivity.class); - bookmarkIntent.putExtras(bundle); - startActivity(bookmarkIntent); - return true; - } - - case R.id.bookmark_delete: - { - if(ConnectionReference.isManualBookmarkReference(refStr)) - { - long id = ConnectionReference.getManualBookmarkId(refStr); - GlobalApp.getManualBookmarkGateway().delete(id); - manualBookmarkAdapter.remove(id); - separatedListAdapter.notifyDataSetChanged(); - } - else - { - assert false; - } - - showWelcomeScreenOrBookmarkList(); - - // clear super bar text - superBarEditText.setText(""); - return true; - } - } + showWelcomeScreenOrBookmarkList(); + + // clear super bar text + superBarEditText.setText(""); + return true; + } return false; } @@ -333,41 +330,31 @@ public class HomeActivity extends Activity @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - - case R.id.newBookmark: - { - Intent bookmarkIntent = new Intent(this, BookmarkActivity.class); - startActivity(bookmarkIntent); - break; - } - - case R.id.appSettings: - { - Intent settingsIntent = new Intent(this, ApplicationSettingsActivity.class); - startActivity(settingsIntent); - break; - } - - case R.id.help: - { - Intent helpIntent = new Intent(this, HelpActivity.class); - startActivity(helpIntent); - break; - } - - case R.id.exit: - { - finish(); - break; - } - - case R.id.about: - { - Intent aboutIntent = new Intent(this, AboutActivity.class); - startActivity(aboutIntent); - break; - } + // refer to http://tools.android.com/tips/non-constant-fields why we can't use switch/case here .. + int itemId = item.getItemId(); + if (itemId == R.id.newBookmark) + { + Intent bookmarkIntent = new Intent(this, BookmarkActivity.class); + startActivity(bookmarkIntent); + } + else if (itemId == R.id.appSettings) + { + Intent settingsIntent = new Intent(this, ApplicationSettingsActivity.class); + startActivity(settingsIntent); + } + else if (itemId == R.id.help) + { + Intent helpIntent = new Intent(this, HelpActivity.class); + startActivity(helpIntent); + } + else if (itemId == R.id.exit) + { + finish(); + } + else if (itemId == R.id.about) + { + Intent aboutIntent = new Intent(this, AboutActivity.class); + startActivity(aboutIntent); } return true; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ScrollView2D.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ScrollView2D.java index 9150e5ccc..332306abb 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ScrollView2D.java @@ -19,7 +19,7 @@ * http://GORGES.us */ -package com.freerdp.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.util.List; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java index eef2c3d65..5a637930c 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java @@ -7,21 +7,21 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.util.Iterator; import java.util.List; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.application.GlobalSettings; -import com.freerdp.afreerdp.application.SessionState; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.domain.ManualBookmark; -import com.freerdp.afreerdp.services.LibFreeRDP; -import com.freerdp.afreerdp.utils.KeyboardMapper; -import com.freerdp.afreerdp.utils.Mouse; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.application.GlobalSettings; +import com.freerdp.freerdpcore.application.SessionState; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.domain.ManualBookmark; +import com.freerdp.freerdpcore.services.LibFreeRDP; +import com.freerdp.freerdpcore.utils.KeyboardMapper; +import com.freerdp.freerdpcore.utils.Mouse; import android.app.Activity; import android.app.Dialog; @@ -754,43 +754,36 @@ public class SessionActivity extends Activity @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) - { - case R.id.session_touch_pointer: - { - // toggle touch pointer - if(touchPointerView.getVisibility() == View.VISIBLE) - { - touchPointerView.setVisibility(View.INVISIBLE); - sessionView.setTouchPointerPadding(0, 0); - } - else - { - touchPointerView.setVisibility(View.VISIBLE); - sessionView.setTouchPointerPadding(touchPointerView.getPointerWidth(), touchPointerView.getPointerHeight()); - } - break; - } + // refer to http://tools.android.com/tips/non-constant-fields why we can't use switch/case here .. + int itemId = item.getItemId(); - case R.id.session_sys_keyboard: + if (itemId == R.id.session_touch_pointer) + { + // toggle touch pointer + if(touchPointerView.getVisibility() == View.VISIBLE) { - showKeyboard(!sysKeyboardVisible, false); - break; + touchPointerView.setVisibility(View.INVISIBLE); + sessionView.setTouchPointerPadding(0, 0); } - - case R.id.session_ext_keyboard: + else { - showKeyboard(false, !extKeyboardVisible); - break; - } - - case R.id.session_disconnect: - { - showKeyboard(false, false); - LibFreeRDP.disconnect(session.getInstance()); - break; + touchPointerView.setVisibility(View.VISIBLE); + sessionView.setTouchPointerPadding(touchPointerView.getPointerWidth(), touchPointerView.getPointerHeight()); } } + else if (itemId == R.id.session_sys_keyboard) + { + showKeyboard(!sysKeyboardVisible, false); + } + else if (itemId == R.id.session_ext_keyboard) + { + showKeyboard(false, !extKeyboardVisible); + } + else if (itemId == R.id.session_disconnect) + { + showKeyboard(false, false); + LibFreeRDP.disconnect(session.getInstance()); + } return true; } diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/SessionView.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionView.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/presentation/SessionView.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionView.java index f1234567f..0074e2eb9 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/SessionView.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionView.java @@ -7,7 +7,7 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import android.util.AttributeSet; import android.util.Log; @@ -21,9 +21,9 @@ import android.graphics.drawable.BitmapDrawable; import java.util.*; -import com.freerdp.afreerdp.application.SessionState; -import com.freerdp.afreerdp.utils.DoubleGestureDetector; -import com.freerdp.afreerdp.utils.GestureDetector; +import com.freerdp.freerdpcore.application.SessionState; +import com.freerdp.freerdpcore.utils.DoubleGestureDetector; +import com.freerdp.freerdpcore.utils.GestureDetector; public class SessionView extends View diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/ShortcutsActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ShortcutsActivity.java similarity index 94% rename from client/Android/src/com/freerdp/afreerdp/presentation/ShortcutsActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ShortcutsActivity.java index 947cb05e2..3281774c5 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/ShortcutsActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/ShortcutsActivity.java @@ -7,15 +7,15 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; import java.util.ArrayList; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.services.SessionRequestHandlerActivity; -import com.freerdp.afreerdp.utils.BookmarkArrayAdapter; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.services.SessionRequestHandlerActivity; +import com.freerdp.freerdpcore.utils.BookmarkArrayAdapter; import android.app.AlertDialog; import android.app.ListActivity; diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/TouchPointerView.java similarity index 98% rename from client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/TouchPointerView.java index 7850f9fdf..f58b840bd 100644 --- a/client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/TouchPointerView.java @@ -7,10 +7,10 @@ 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.afreerdp.presentation; +package com.freerdp.freerdpcore.presentation; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.utils.GestureDetector; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.utils.GestureDetector; import android.content.Context; import android.graphics.Matrix; diff --git a/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java index 97aefdde7..6abac51d2 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java @@ -7,12 +7,12 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import java.util.ArrayList; -import com.freerdp.afreerdp.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.BookmarkBase; import android.content.ContentValues; import android.database.Cursor; diff --git a/client/Android/src/com/freerdp/afreerdp/services/BookmarkDB.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java similarity index 98% rename from client/Android/src/com/freerdp/afreerdp/services/BookmarkDB.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java index 02f74440b..4f209a299 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/BookmarkDB.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java @@ -7,7 +7,7 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import android.content.Context; import android.provider.BaseColumns; diff --git a/client/Android/src/com/freerdp/afreerdp/services/FreeRDPSuggestionProvider.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/FreeRDPSuggestionProvider.java similarity index 92% rename from client/Android/src/com/freerdp/afreerdp/services/FreeRDPSuggestionProvider.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/FreeRDPSuggestionProvider.java index 1fd06a7cf..ee242d5d4 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/FreeRDPSuggestionProvider.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/FreeRDPSuggestionProvider.java @@ -7,15 +7,15 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import java.util.ArrayList; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.domain.ManualBookmark; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.domain.ManualBookmark; import android.app.SearchManager; import android.content.ContentProvider; diff --git a/client/Android/src/com/freerdp/afreerdp/services/HistoryDB.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/HistoryDB.java similarity index 96% rename from client/Android/src/com/freerdp/afreerdp/services/HistoryDB.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/HistoryDB.java index 900336f60..f12be6bb0 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/HistoryDB.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/HistoryDB.java @@ -7,7 +7,7 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/client/Android/src/com/freerdp/afreerdp/services/LibFreeRDP.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/LibFreeRDP.java similarity index 96% rename from client/Android/src/com/freerdp/afreerdp/services/LibFreeRDP.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/LibFreeRDP.java index 8de2cc435..672dcd934 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/LibFreeRDP.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/LibFreeRDP.java @@ -7,13 +7,13 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; -import com.freerdp.afreerdp.application.GlobalApp; -import com.freerdp.afreerdp.application.SessionState; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ManualBookmark; +import com.freerdp.freerdpcore.application.GlobalApp; +import com.freerdp.freerdpcore.application.SessionState; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ManualBookmark; import android.graphics.Bitmap; diff --git a/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/ManualBookmarkGateway.java similarity index 93% rename from client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/ManualBookmarkGateway.java index a95f8e40d..6b07850ac 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/ManualBookmarkGateway.java @@ -7,7 +7,7 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import java.util.ArrayList; @@ -15,8 +15,8 @@ import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteOpenHelper; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ManualBookmark; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ManualBookmark; public class ManualBookmarkGateway extends BookmarkBaseGateway { diff --git a/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java index beb6a596f..df3cfb478 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java @@ -7,12 +7,12 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; import java.util.ArrayList; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.QuickConnectBookmark; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.QuickConnectBookmark; import android.database.Cursor; import android.database.SQLException; diff --git a/client/Android/src/com/freerdp/afreerdp/services/SessionRequestHandlerActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/SessionRequestHandlerActivity.java similarity index 90% rename from client/Android/src/com/freerdp/afreerdp/services/SessionRequestHandlerActivity.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/SessionRequestHandlerActivity.java index ac41df7c1..57a61bddc 100644 --- a/client/Android/src/com/freerdp/afreerdp/services/SessionRequestHandlerActivity.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/SessionRequestHandlerActivity.java @@ -7,11 +7,11 @@ 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.afreerdp.services; +package com.freerdp.freerdpcore.services; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.presentation.BookmarkActivity; -import com.freerdp.afreerdp.presentation.SessionActivity; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.presentation.BookmarkActivity; +import com.freerdp.freerdpcore.presentation.SessionActivity; import android.app.Activity; import android.app.SearchManager; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/BookmarkArrayAdapter.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java similarity index 91% rename from client/Android/src/com/freerdp/afreerdp/utils/BookmarkArrayAdapter.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java index 50d2cf66b..cdd4721a6 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/BookmarkArrayAdapter.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java @@ -7,7 +7,7 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; import java.util.List; @@ -22,12 +22,12 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.freerdp.afreerdp.R; -import com.freerdp.afreerdp.domain.BookmarkBase; -import com.freerdp.afreerdp.domain.ConnectionReference; -import com.freerdp.afreerdp.domain.ManualBookmark; -import com.freerdp.afreerdp.domain.PlaceholderBookmark; -import com.freerdp.afreerdp.presentation.BookmarkActivity; +import com.freerdp.freerdpcore.R; +import com.freerdp.freerdpcore.domain.BookmarkBase; +import com.freerdp.freerdpcore.domain.ConnectionReference; +import com.freerdp.freerdpcore.domain.ManualBookmark; +import com.freerdp.freerdpcore.domain.PlaceholderBookmark; +import com.freerdp.freerdpcore.presentation.BookmarkActivity; public class BookmarkArrayAdapter extends ArrayAdapter { diff --git a/client/Android/src/com/freerdp/afreerdp/utils/ButtonPreference.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/ButtonPreference.java similarity index 96% rename from client/Android/src/com/freerdp/afreerdp/utils/ButtonPreference.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/ButtonPreference.java index fb9cbe261..3f119fa15 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/ButtonPreference.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/ButtonPreference.java @@ -7,9 +7,9 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; -import com.freerdp.afreerdp.R; +import com.freerdp.freerdpcore.R; import android.content.Context; import android.preference.Preference; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/DoubleGestureDetector.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/utils/DoubleGestureDetector.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java index e837a6a2e..1146c4c92 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/DoubleGestureDetector.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java @@ -7,14 +7,14 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; import android.content.Context; import android.os.Handler; import android.view.MotionEvent; import android.view.ScaleGestureDetector; -import com.freerdp.afreerdp.utils.GestureDetector.OnGestureListener; +import com.freerdp.freerdpcore.utils.GestureDetector.OnGestureListener; public class DoubleGestureDetector { /** diff --git a/client/Android/src/com/freerdp/afreerdp/utils/GestureDetector.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/GestureDetector.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/utils/GestureDetector.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/GestureDetector.java index e656bab77..c8773b930 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/GestureDetector.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/GestureDetector.java @@ -16,7 +16,7 @@ * Modified for aFreeRDP by Martin Fleisz (mfleisz@thinstuff.at) */ -package com.freerdp.afreerdp.utils; +package com.freerdp.freerdpcore.utils; import android.content.Context; import android.os.Build; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntEditTextPreference.java similarity index 97% rename from client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntEditTextPreference.java index 4ce494467..1142bc4ae 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntEditTextPreference.java @@ -7,9 +7,9 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; -import com.freerdp.afreerdp.R; +import com.freerdp.freerdpcore.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntListPreference.java similarity index 95% rename from client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntListPreference.java index 718a69ae7..49b718a29 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/IntListPreference.java @@ -7,7 +7,7 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; import android.content.Context; import android.preference.ListPreference; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/KeyboardMapper.java similarity index 99% rename from client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/KeyboardMapper.java index ae72de873..e9bbb2cd6 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/KeyboardMapper.java @@ -8,9 +8,9 @@ */ -package com.freerdp.afreerdp.utils; +package com.freerdp.freerdpcore.utils; -import com.freerdp.afreerdp.R; +import com.freerdp.freerdpcore.R; import android.content.Context; import android.view.KeyEvent; diff --git a/client/Android/src/com/freerdp/afreerdp/utils/Mouse.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/Mouse.java similarity index 93% rename from client/Android/src/com/freerdp/afreerdp/utils/Mouse.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/Mouse.java index 202c4d5de..38743be93 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/Mouse.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/Mouse.java @@ -7,9 +7,9 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; -import com.freerdp.afreerdp.application.GlobalSettings; +import com.freerdp.freerdpcore.application.GlobalSettings; public class Mouse { diff --git a/client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/SeparatedListAdapter.java similarity index 98% rename from client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java rename to client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/SeparatedListAdapter.java index 9ee8894c1..1528b78b4 100644 --- a/client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java +++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/SeparatedListAdapter.java @@ -8,12 +8,12 @@ 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.afreerdp.utils; +package com.freerdp.freerdpcore.utils; import java.util.LinkedHashMap; import java.util.Map; -import com.freerdp.afreerdp.R; +import com.freerdp.freerdpcore.R; import android.content.Context; import android.view.View; diff --git a/client/Android/aFreeRDP/.classpath b/client/Android/aFreeRDP/.classpath new file mode 100644 index 000000000..a4763d1ee --- /dev/null +++ b/client/Android/aFreeRDP/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/client/Android/aFreeRDP/.project b/client/Android/aFreeRDP/.project new file mode 100644 index 000000000..335291e03 --- /dev/null +++ b/client/Android/aFreeRDP/.project @@ -0,0 +1,33 @@ + + + aFreeRDP + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/client/Android/AndroidManifest.xml.cmake b/client/Android/aFreeRDP/AndroidManifest.xml.cmake similarity index 100% rename from client/Android/AndroidManifest.xml.cmake rename to client/Android/aFreeRDP/AndroidManifest.xml.cmake diff --git a/client/Android/aFreeRDP/CMakeLists.txt b/client/Android/aFreeRDP/CMakeLists.txt new file mode 100644 index 000000000..bf543ed2e --- /dev/null +++ b/client/Android/aFreeRDP/CMakeLists.txt @@ -0,0 +1,64 @@ +# FreeRDP: A Remote Desktop Protocol Implementation +# Android Client +# +# Copyright 2012 Marc-Andre Moreau +# Copyright 2013 Bernhard Miklautz +# +# 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() diff --git a/client/Android/build.xml b/client/Android/aFreeRDP/build.xml similarity index 100% rename from client/Android/build.xml rename to client/Android/aFreeRDP/build.xml diff --git a/client/Android/aFreeRDP/lint.xml b/client/Android/aFreeRDP/lint.xml new file mode 100644 index 000000000..ee0eead5b --- /dev/null +++ b/client/Android/aFreeRDP/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/client/Android/local.properties.cmake b/client/Android/aFreeRDP/local.properties.cmake similarity index 100% rename from client/Android/local.properties.cmake rename to client/Android/aFreeRDP/local.properties.cmake diff --git a/client/Android/project.properties b/client/Android/aFreeRDP/project.properties similarity index 89% rename from client/Android/project.properties rename to client/Android/aFreeRDP/project.properties index ea89160e0..9943db306 100644 --- a/client/Android/project.properties +++ b/client/Android/aFreeRDP/project.properties @@ -9,3 +9,4 @@ # Project target. target=android-8 +android.library.reference.1=../FreeRDPCore diff --git a/client/Android/aFreeRDP/res/drawable-hdpi/icon_launcher_freerdp.png b/client/Android/aFreeRDP/res/drawable-hdpi/icon_launcher_freerdp.png new file mode 100644 index 000000000..45ed86123 Binary files /dev/null and b/client/Android/aFreeRDP/res/drawable-hdpi/icon_launcher_freerdp.png differ diff --git a/client/Android/aFreeRDP/res/drawable-ldpi/icon_launcher_freerdp.png b/client/Android/aFreeRDP/res/drawable-ldpi/icon_launcher_freerdp.png new file mode 100644 index 000000000..b57651bed Binary files /dev/null and b/client/Android/aFreeRDP/res/drawable-ldpi/icon_launcher_freerdp.png differ diff --git a/client/Android/aFreeRDP/res/drawable-mdpi/icon_launcher_freerdp.png b/client/Android/aFreeRDP/res/drawable-mdpi/icon_launcher_freerdp.png new file mode 100644 index 000000000..55335c869 Binary files /dev/null and b/client/Android/aFreeRDP/res/drawable-mdpi/icon_launcher_freerdp.png differ diff --git a/client/Android/aFreeRDP/res/drawable/button_background.xml b/client/Android/aFreeRDP/res/drawable/button_background.xml new file mode 100644 index 000000000..9fdf3096d --- /dev/null +++ b/client/Android/aFreeRDP/res/drawable/button_background.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/Android/aFreeRDP/res/drawable/icon_launcher_freerdp.png b/client/Android/aFreeRDP/res/drawable/icon_launcher_freerdp.png new file mode 100644 index 000000000..ad325d46e Binary files /dev/null and b/client/Android/aFreeRDP/res/drawable/icon_launcher_freerdp.png differ diff --git a/client/Android/aFreeRDP/res/drawable/separator_background.xml b/client/Android/aFreeRDP/res/drawable/separator_background.xml new file mode 100644 index 000000000..61c7b8925 --- /dev/null +++ b/client/Android/aFreeRDP/res/drawable/separator_background.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/client/Android/aFreeRDP/res/values/dimens.xml b/client/Android/aFreeRDP/res/values/dimens.xml new file mode 100644 index 000000000..dc7f5bb72 --- /dev/null +++ b/client/Android/aFreeRDP/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 50dip + \ No newline at end of file diff --git a/client/Android/aFreeRDP/res/values/integers.xml b/client/Android/aFreeRDP/res/values/integers.xml new file mode 100644 index 000000000..f6a53db51 --- /dev/null +++ b/client/Android/aFreeRDP/res/values/integers.xml @@ -0,0 +1,72 @@ + + + + 0xF1 + 0xF2 + 0xF3 + + + 0x01 + 0x02 + + + 0x03 + 0x04 + 0x05 + + 0x06 + 0x07 + 0x08 + 0x09 + + + 0x0A + 0x0B + 0x0C + 0x0D + 0x0E + 0x0F + 0x10 + 0x11 + 0x12 + 0x13 + 0x14 + 0x15 + 0x16 + 0x17 + 0x18 + 0x19 + 0x1A + 0x1B + 0x1C + 0x1D + + + 0x1E + 0x1F + 0x20 + 0x21 + 0x22 + 0x23 + 0x24 + 0x25 + 0x26 + 0x27 + 0x28 + 0x29 + 0x2A + 0x2B + 0x2C + 0x2D + 0x2E + 0x2F + 0x30 + 0x31 + + + 0x32 + 0x33 + 0x34 + 0x45 + + diff --git a/client/Android/aFreeRDP/res/values/strings.xml b/client/Android/aFreeRDP/res/values/strings.xml new file mode 100644 index 000000000..780a7aa3e --- /dev/null +++ b/client/Android/aFreeRDP/res/values/strings.xml @@ -0,0 +1,179 @@ + + + aFreeRDP + + + Yes + No + Cancel + Continue + Login + Logout + + Exit + About + Help + New Connection + Settings + + Connection + Connect + Edit + Delete + + Keyboard + Function Keys + Touch Pointer + home + disconnect + + Manual Connections + Active Sessions + + Login + No Servers + Connecting ... + Disconnecting ... + Connection Lost + Wrong Password + Invalid Username + Add Connection + + aFreeRDP + Connect to Computer + Remote Computers + + Host + Label + Host + Port + Credentials + Credentials + Username + Password + Domain + Settings + Screen + Screen Settings + Colors + + High Color (16 Bit) + True Color (24 Bit) + Highest Quality (32 Bit) + + + 16 + 24 + 32 + + Resolution + Automatic + Custom + + Automatic + Custom + 640x480 + 720x480 + 800x600 + 1024x768 + 1280x1024 + 1440x900 + 1920x1080 + 1920x1200 + + + automatic + custom + 640x480 + 720x480 + 800x600 + 1024x768 + 1280x1024 + 1440x900 + 1920x1080 + 1920x1200 + + Width + Height + Performance + Performance Settings + RemoteFX + Desktop Background + Font Smoothing + Desktop Composition + Window contents while dragging + Menu Animation + Visual Styles + Advanced + Advanced Settings + 3G Settings + 3G Screen + 3G Performance + Security + + Automatic + RDP + TLS + NLA + + + 0 + 1 + 2 + 3 + + Remote Program + Working Directory + Console Mode + + ******* + not set + User Interface + Hide Status Bar + Hide Zoom Controls + Swap Mouse Buttons + Invert Scrolling + Touch Pointer Auto Scroll + Show Dialog on Exit + Power Saving + Close idle Connections + Security + Accept all Certificates + Clear Certificate Cache + After %1$d Minutes + Disabled + + Connection Settings + Settings + aFreeRDP - FreeRDP for Android + RDP Connections + Help + About + + Cancel without saving? + Press "Cancel" to abort!\nPress "Continue" to specify the required fields! + Failed to establish a connection to the server! + + The screen settings have changed because the server does not support the settings you specified! + Deleted the certificate cache! + Failed to delete certificate cache! + + Verify Certificate + The identity of the remote computer cannot be verified. Do you want to connect anyway? + Please enter your credentials + Create Shortcut + Shortcut name: + Connecting ... + Logging in ... + About aFreeRDP + Version: %1$s\n\u00A9 2012 Thinstuff Technologies GmbH + Save Connection Settings? + Your connection settings have not been saved! Do you want to save them? + Save Connection? + Do you want to save any changes you made to the connection settings? + Do not ask again + Exit Application? + Are you sure you want to exit the application? + Delete Certificates? + Are you sure you want to delete all your cached Certificates? + diff --git a/client/Android/aFreeRDP/res/values/theme.xml b/client/Android/aFreeRDP/res/values/theme.xml new file mode 100644 index 000000000..ef321c4c0 --- /dev/null +++ b/client/Android/aFreeRDP/res/values/theme.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + diff --git a/client/Android/aFreeRDP/res/xml/searchable.xml b/client/Android/aFreeRDP/res/xml/searchable.xml new file mode 100644 index 000000000..4d0d7ed79 --- /dev/null +++ b/client/Android/aFreeRDP/res/xml/searchable.xml @@ -0,0 +1,26 @@ + + + + diff --git a/client/Android/aFreeRDP/src/com/freerdp/afreerdp/application/GlobalApp.java b/client/Android/aFreeRDP/src/com/freerdp/afreerdp/application/GlobalApp.java new file mode 100644 index 000000000..c0b36f020 --- /dev/null +++ b/client/Android/aFreeRDP/src/com/freerdp/afreerdp/application/GlobalApp.java @@ -0,0 +1,6 @@ +package com.freerdp.afreerdp.application; + + +public class GlobalApp extends com.freerdp.freerdpcore.application.GlobalApp { + +}