Android: Using standard location for cli

Author: asalamon74

Changelog

@@ -4,6 +4,8 @@ version 0.84.01
 	Updating lens info database ( exiftool 10.200 )
 	Testing support for K-1
 	Small speedup
+	Increase Android 5 compatibility
+	Android version requires Android 4.1 (http://stackoverflow.com/a/26422855/21348 )
 
 version 0.84.00 ( 2016-05-09 )
 	servermode subcommand: set_shutter_speed, set_iso, usleep

android/AndroidManifest.xml

@@ -16,7 +16,7 @@
                   android:label="@string/titlePrefs">
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="12" />
+    <uses-sdk android:minSdkVersion="16" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

android/jni/Android.mk

@@ -11,7 +11,7 @@ LOCAL_SRC_FILES := ../../pslr_enum.c \
 	../../pktriggercord-servermode.c \
 	../../pktriggercord-cli.c
 DEFINES 	:= -DANDROID -DVERSION=\"$(VERSION)\" 
-LOCAL_CFLAGS  	:= $(DEFINES) -frtti -I.. -Istlport -g 
-LOCAL_LDLIBS	:= -llog -lstdc++
+LOCAL_CFLAGS  	:= $(DEFINES) -frtti -I.. -Istlport -g -fPIE
+LOCAL_LDLIBS	:= -llog -lstdc++ -fPIE -pie
 
 include $(BUILD_EXECUTABLE)

android/project.properties

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

android/src/info/melda/sala/pktriggercord/PkTriggerCord.java

@@ -5,6 +5,7 @@
 import android.content.res.AssetManager;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.widget.Toast;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,15 +15,18 @@
 
 public class PkTriggerCord extends Application {
     public static final String TAG = "PkTriggerCord";
-    private static final String CLI_HOME = "/data/local/";
-    private static final String CLI_DIR = "pktriggercord";
+    private String cliHome;
+    //    private static final String CLI_DIR = "pktriggercord";
     private static final int MARK_LIMIT = 1000000;
     private Process p;
     private SharedPreferences prefs;
 
     @Override
     public void onCreate() {
 	super.onCreate();
+
+        cliHome = getApplicationContext().getFilesDir().getAbsolutePath();
+
         PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 	Log.v( TAG, "Before installCli");
@@ -42,7 +46,7 @@ public String getSaveDir() {
     private void startCli() {
 	try {
 	    p = new ProcessBuilder()
-		.command("su", "-c", CLI_HOME+CLI_DIR+"/pktriggercord-cli --servermode")
+		.command("su", "-c", cliHome+"/pktriggercord-cli --servermode")
 		.start();
 	    SystemClock.sleep(1000);
 	} catch( Exception e ) {
@@ -137,7 +141,7 @@ private void copyAsset(String fileName) throws Exception {
 	boolean needCliInstall;
         AssetManager assetManager =  getAssets();
 	InputStream in = assetManager.open(fileName);
-	String fullFileName = CLI_HOME + CLI_DIR + "/" + fileName;
+	String fullFileName = cliHome + "/" + fileName;
 
 	try {
 	    FileInputStream fis = new FileInputStream(fullFileName);
@@ -157,9 +161,9 @@ private void copyAsset(String fileName) throws Exception {
 	    final int myUid = android.os.Process.myUid();
             Log.v( TAG, "myUid:"+myUid);
 	    simpleSudoWrapper( new ArrayList<String>() {{
-			add("mkdir -p "+CLI_HOME+CLI_DIR);
-			add("chown "+myUid+" "+CLI_HOME+CLI_DIR);
-			add("chmod 777 "+CLI_HOME+CLI_DIR);
+			add("mkdir -p "+cliHome);
+			add("chown "+myUid+" "+cliHome);
+			add("chmod 777 "+cliHome);
 		    }});
             Log.v( TAG, "After first simpleSudoWrapper");
 	    simpleSudoWrapper("rm -f "+fullFileName);