Merge branch 'master' into matrix

.travis.yml

@@ -57,7 +57,7 @@ install:
     tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
     tar -zxf android-sdk_r24.3.4-linux.tgz &&
     $ANDROID list sdk --extended -a &&
-    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https;
+    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
   fi
 - sudo python -m easy_install --upgrade pyOpenSSL
 - sudo pip install pyjavaproperties

JGE/Dependencies/libpng/png.h

@@ -474,7 +474,7 @@
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
-#include "zlib.h"
+#include "../include/zlib.h"
 #endif
 
 /* include all user configurable info, including optional assembler routines */

JGE/include/JGE.h

@@ -394,6 +394,7 @@ class JGE
    void SetJNIEnv(JNIEnv * env, jclass cls);
    void sendJNICommand(std::string command);
    std::string getFileSystemLocation();
+   std::string getFileUserFolderPath();
 #endif 
   
  protected:

JGE/src/JFileSystem.cpp

@@ -131,10 +131,11 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     systemPath = [[documentsDirectory  stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
 
 #elif defined (ANDROID)
-    userPath = JGE::GetInstance()->getFileSystemLocation();
-    systemPath = "";
+    userPath = JGE::GetInstance()->getFileUserFolderPath();
+    systemPath = JGE::GetInstance()->getFileSystemLocation();
 
     DebugTrace("User path " << userPath);
+    DebugTrace("System path " << systemPath);
 #elif defined (QT_CONFIG)
 
     QDir sysDir(RESDIR);

JGE/src/JGE.cpp

@@ -668,7 +668,7 @@ string JGE::getFileSystemLocation()
     if (env == NULL)
     {
         DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
     };
 
     jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
@@ -677,7 +677,36 @@ string JGE::getFileSystemLocation()
     if (methodId == 0)
     {
         DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
+    };
+
+    jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);
+
+    // Now convert the Java String to C++ char array
+	const char* cstr = env->GetStringUTFChars(systemPath, 0); 
+	string retVal (cstr);
+	env->ReleaseStringUTFChars(systemPath, cstr); 
+	env->DeleteLocalRef(systemPath);
+
+    return retVal;
+}
+
+string JGE::getFileUserFolderPath()
+{
+    JNIEnv * env = getJNIEnv();
+    if (env == NULL)
+    {
+        DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic");
+        return "/mnt/sdcard/Wagic/User";
+    };
+
+    jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
+    jmethodID methodId = env->GetStaticMethodID( jniClass, "getUserFolderPath", "()Ljava/lang/String;");
+
+    if (methodId == 0)
+    {
+        DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic");
+        return "/mnt/sdcard/Wagic/User";
     };
 
     jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);

projects/mtg/Android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0201" android:versionName="@string/app_version" package="net.wagic.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0211" android:installLocation="preferExternal" android:versionName="@string/app_version" package="net.wagic.app">
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -12,5 +12,5 @@
 	</intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="13"/>
 </manifest>

projects/mtg/Android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Wagic</string>
-    <string name="app_version">0.20.1</string>
-    <string name="info_text">Wagic v0.20.1\\nAll Rights Reserved.</string>
+    <string name="app_version">0.21.1</string>
+    <string name="info_text">Wagic v0.21.1\\nAll Rights Reserved.</string>
 </resources>