fix build with Android 6.0 sdk, reenable scripts on 1.7

httpclient/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.zhuoweizhang.mcpelauncher.httpclient"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="9" />
+
+</manifest>

httpclient/ant.properties

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

httpclient/build.xml

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

httpclient/project.properties

@@ -0,0 +1,16 @@
+# 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-21
+
+android.library=true

src/com/mojang/android/net/HTTPRequest.java → httpclient/src/com/mojang/android/net/HTTPRequest.java

@@ -12,7 +12,7 @@
 
 public class HTTPRequest {
 
-	public static boolean debugNet = net.zhuoweizhang.mcpelauncher.BuildConfig.DEBUG;
+	public static boolean debugNet = net.zhuoweizhang.mcpelauncher.httpclient.BuildConfig.DEBUG;
 
 	public String url, requestBody, cookieData, contentType;
 

project.properties

@@ -19,3 +19,4 @@ android.library.reference.1=../aFileChooser/aFileChooser
 android.library.reference.2=../libsuperuser/libsuperuser
 #android.library.reference.3=external_libs/cardview
 android.library.reference.3=external_libs/xbox_interop
+android.library.reference.4=httpclient

src/com/mojang/minecraftpe/MainActivity.java

@@ -2817,8 +2817,7 @@ private boolean isForcingController() {
 	}
 
 	protected boolean hasScriptSupport() {
-		return false; // 1.9.0 lite
-		//return true;//mcPkgInfo.versionName.startsWith(SCRIPT_SUPPORT_VERSION);
+		return mcPkgInfo.versionName.startsWith(SCRIPT_SUPPORT_VERSION);
 	}
 	public String getMCPEVersion() {
 		return mcPkgInfo.versionName;

src/de/ankri/views/Switch.java

@@ -538,7 +538,7 @@ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 	private Layout makeLayout(CharSequence text)
 	{
 		final CharSequence transformed = (mSwitchTransformationMethod != null) ? mSwitchTransformationMethod.getTransformation(text, this) : text;
-		return new StaticLayout(transformed, mTextPaint, (int) FloatMath.ceil(Layout.getDesiredWidth(transformed, mTextPaint)), Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
+		return new StaticLayout(transformed, mTextPaint, (int) Math.ceil(Layout.getDesiredWidth(transformed, mTextPaint)), Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
 	}
 
 	/**

src/net/zhuoweizhang/mcpelauncher/WrappedPackageManager.java

@@ -475,6 +475,11 @@ public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
         return wrapped.getUserBadgedLabel(label, user);
     }
 
+    @Override
+    public boolean isPermissionRevokedByPolicy(String permName, String pkgName) {
+        return wrapped.isPermissionRevokedByPolicy(permName, pkgName);
+    }
+
     // Samsung Nougat ROMs use this
     public int getSystemFeatureLevel(String feature) {
         try {