Skip to content

Commit 302a973

Browse files
author
Mihail Slavchev
committed
rename com.tns.Platform to com.tns.Runtime and make it use instances
instead of statics
1 parent a6663ae commit 302a973

59 files changed

Lines changed: 1053 additions & 844 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎binding-generator/Generator/src/com/tns/binding/tests/dummy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.ow2.asmdex.MethodVisitor;
1010
import org.ow2.asmdex.structureCommon.Label;
1111

12-
class dummy
12+
class Dummy
1313
{
1414
public static void dummyMethod(Object thiz, String name, Object... args)
1515
{
@@ -43,7 +43,7 @@ public static void calldummyMethodParams()
4343

4444
public static void callDummyGenMethod()
4545
{
46-
Random val = dummy.<Object, Integer, Random>dummyGenMethod(new Object(), "someName", new Object(), 5);
46+
Random val = Dummy.<Object, Integer, Random>dummyGenMethod(new Object(), "someName", new Object(), 5);
4747

4848
}
4949

‎binding-generator/Generator/src/com/tns/binding/tests/dumpObject.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import org.ow2.asmdex.MethodVisitor;
88
import org.ow2.asmdex.structureCommon.Label;
99

10-
public class dumpObject
10+
public class DumpObject
1111
{
1212

13-
public static void dumpObject(ApplicationWriter aw) {
13+
public static void dump(ApplicationWriter aw) {
1414
ClassVisitor cv;
1515
FieldVisitor fv;
1616
MethodVisitor mv;
@@ -35,6 +35,7 @@ public static void dumpObject(ApplicationWriter aw) {
3535
fv = cv.visitField(org.ow2.asmdex.Opcodes.ACC_PRIVATE, "__initialized", "Z", null, null);
3636
fv.visitEnd();
3737
}
38+
String runtimeClass = "Lcom/tns/Runtime;";
3839
{
3940
mv = cv.visitMethod(org.ow2.asmdex.Opcodes.ACC_PUBLIC + org.ow2.asmdex.Opcodes.ACC_CONSTRUCTOR, "<init>", "V", null, null);
4041
mv.visitCode();
@@ -45,14 +46,14 @@ public static void dumpObject(ApplicationWriter aw) {
4546
Label l0 = new Label();
4647
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
4748
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 2, 3);
48-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 3 });
49+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 3 });
4950
mv.visitLabel(l0);
5051
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BOOLEAN, "Lcom/tns/java/lang/Object;", "__ctorOverridden", "Z", 1, 3);
5152
Label l1 = new Label();
5253
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_EQZ, l1, 1, 0);
5354
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 0, 0);
5455
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "init");
55-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;Z[Ljava/lang/Object;", new int[] { 3, 1, 2, 0 });
56+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;Z[Ljava/lang/Object;", new int[] { 3, 1, 2, 0 });
5657
mv.visitLabel(l1);
5758
mv.visitInsn(org.ow2.asmdex.Opcodes.INSN_RETURN_VOID);
5859
mv.visitEnd();
@@ -66,15 +67,15 @@ public static void dumpObject(ApplicationWriter aw) {
6667
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
6768
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 1, 1);
6869
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 1, 2);
69-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 2 });
70+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 2 });
7071
mv.visitLabel(l0);
7172
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BYTE, "Lcom/tns/java/lang/Object;", "__ho0", "B", 1, 2);
7273
mv.visitOperationInsn(org.ow2.asmdex.Opcodes.INSN_AND_INT_LIT8, 1, 1, 0, 1);
7374
Label l1 = new Label();
7475
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_LEZ, l1, 1, 0);
7576
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 0, 0);
7677
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "clone");
77-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
78+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
7879
mv.visitIntInsn(org.ow2.asmdex.Opcodes.INSN_MOVE_RESULT_OBJECT, 1);
7980
Label l2 = new Label();
8081
mv.visitLabel(l2);
@@ -103,7 +104,7 @@ public static void dumpObject(ApplicationWriter aw) {
103104
Label l0 = new Label();
104105
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
105106
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 2, 3);
106-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 3 });
107+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 3 });
107108
mv.visitLabel(l0);
108109
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BYTE, "Lcom/tns/java/lang/Object;", "__ho0", "B", 1, 3);
109110
mv.visitOperationInsn(org.ow2.asmdex.Opcodes.INSN_AND_INT_LIT8, 1, 1, 0, 2);
@@ -113,7 +114,7 @@ public static void dumpObject(ApplicationWriter aw) {
113114
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 1, 0);
114115
mv.visitArrayOperationInsn(org.ow2.asmdex.Opcodes.INSN_APUT_OBJECT, 4, 0, 1);
115116
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "equals");
116-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 3, 1, 0 });
117+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 3, 1, 0 });
117118
mv.visitIntInsn(org.ow2.asmdex.Opcodes.INSN_MOVE_RESULT_OBJECT, 1);
118119
mv.visitTypeInsn(org.ow2.asmdex.Opcodes.INSN_CHECK_CAST, 0, 1, 0, "Ljava/lang/Boolean;");
119120
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_VIRTUAL, "Ljava/lang/Boolean;", "booleanValue", "Z", new int[] { 1 });
@@ -145,15 +146,15 @@ public static void dumpObject(ApplicationWriter aw) {
145146
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
146147
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 1, 1);
147148
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 1, 2);
148-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 2 });
149+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 2 });
149150
mv.visitLabel(l0);
150151
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BYTE, "Lcom/tns/java/lang/Object;", "__ho0", "B", 1, 2);
151152
mv.visitOperationInsn(org.ow2.asmdex.Opcodes.INSN_AND_INT_LIT8, 1, 1, 0, 4);
152153
Label l1 = new Label();
153154
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_LEZ, l1, 1, 0);
154155
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 0, 0);
155156
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "finalize");
156-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
157+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
157158
Label l2 = new Label();
158159
mv.visitLabel(l2);
159160
mv.visitInsn(org.ow2.asmdex.Opcodes.INSN_RETURN_VOID);
@@ -179,15 +180,15 @@ public static void dumpObject(ApplicationWriter aw) {
179180
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
180181
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 1, 1);
181182
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 1, 2);
182-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 2 });
183+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 2 });
183184
mv.visitLabel(l0);
184185
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BYTE, "Lcom/tns/java/lang/Object;", "__ho0", "B", 1, 2);
185186
mv.visitOperationInsn(org.ow2.asmdex.Opcodes.INSN_AND_INT_LIT8, 1, 1, 0, 8);
186187
Label l1 = new Label();
187188
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_LEZ, l1, 1, 0);
188189
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 0, 0);
189190
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "hashCode");
190-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
191+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
191192
mv.visitIntInsn(org.ow2.asmdex.Opcodes.INSN_MOVE_RESULT_OBJECT, 1);
192193
mv.visitTypeInsn(org.ow2.asmdex.Opcodes.INSN_CHECK_CAST, 0, 1, 0, "Ljava/lang/Integer;");
193194
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_VIRTUAL, "Ljava/lang/Integer;", "intValue", "I", new int[] { 1 });
@@ -299,15 +300,15 @@ public static void dumpObject(ApplicationWriter aw) {
299300
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, l0, 1, 0);
300301
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 1, 1);
301302
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, "Lcom/tns/java/lang/Object;", "__initialized", "Z", 1, 2);
302-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "initInstance", "VLjava/lang/Object;", new int[] { 2 });
303+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "initInstance", "VLjava/lang/Object;", new int[] { 2 });
303304
mv.visitLabel(l0);
304305
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IGET_BYTE, "Lcom/tns/java/lang/Object;", "__ho0", "B", 1, 2);
305306
mv.visitOperationInsn(org.ow2.asmdex.Opcodes.INSN_AND_INT_LIT8, 1, 1, 0, 16);
306307
Label l1 = new Label();
307308
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_LEZ, l1, 1, 0);
308309
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 0, 0);
309310
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "toString");
310-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, "Lcom/tns/Platform;", "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
311+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, "callJSMethod", "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;", new int[] { 2, 1, 0 });
311312
mv.visitIntInsn(org.ow2.asmdex.Opcodes.INSN_MOVE_RESULT_OBJECT, 1);
312313
mv.visitTypeInsn(org.ow2.asmdex.Opcodes.INSN_CHECK_CAST, 0, 1, 0, "Ljava/lang/String;");
313314
Label l2 = new Label();

‎binding-generator/Generator/src/com/tns/bindings/Dump.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public class Dump
1717
private static final String callJsMethodSignatureCtor = "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;Z[Ljava/lang/Object;";
1818
private static final String callJsMethodSignatureMethod = "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;";
1919
private static final String LCOM_TNS = "Lcom/tns/gen/";
20-
private static final String LCOM_TNS_PLATFORM = "Lcom/tns/Platform;";
20+
private static final String LCOM_TNS_RUNTIME = "Lcom/tns/Runtime;";
2121
static final String preferenceActivityJniSignature = "Lcom/tns/android/preference/PreferenceActivity;";
2222
static final String preferenceActivityClass = "Landroid/preference/PreferenceActivity;";
2323
static final String objectClass = "Ljava/lang/Object;";
2424

25-
static final String platformClass = LCOM_TNS_PLATFORM;
25+
static final String runtimeClass = LCOM_TNS_RUNTIME;
2626
static final String callJSMethodName = "callJSMethod";
2727
static final String initInstanceMethodName = "initInstance";
2828

@@ -617,7 +617,7 @@ private void generateCtorOverridenBlock(MethodVisitor mv, int thisRegister, Cons
617617
int argCount = generateArrayForCallJsArguments(mv, ctor.getParameterTypes(), thisRegister, classSignature, tnsClassSignature);
618618
mv.visitStringInsn(org.ow2.asmdex.Opcodes.INSN_CONST_STRING, 1, "init"); //put "init" in register 1
619619
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, 2, 1); //put true to register 2 == isConstructor argument
620-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, LCOM_TNS_PLATFORM, "callJSMethod", callJsMethodSignatureCtor, new int[]
620+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, LCOM_TNS_RUNTIME, "callJSMethod", callJsMethodSignatureCtor, new int[]
621621
{ 3, 1, 2, 0 }); //invoke callJSMethod(this, "init", true, params)
622622
}
623623

@@ -628,7 +628,7 @@ private void generateInitializedBlock(MethodVisitor mv, int thisRegister, String
628628
mv.visitJumpInsn(org.ow2.asmdex.Opcodes.INSN_IF_NEZ, label, thisRegister - 2, 0); //compare local var 1 with false
629629
mv.visitVarInsn(org.ow2.asmdex.Opcodes.INSN_CONST_4, thisRegister - 1, 1); //put true in local var 1
630630
mv.visitFieldInsn(org.ow2.asmdex.Opcodes.INSN_IPUT_BOOLEAN, tnsClassSignature, "__initialized", "Z", thisRegister - 1 , thisRegister); //set field to the value of 2
631-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, LCOM_TNS_PLATFORM, "initInstance", "VLjava/lang/Object;", new int[] { thisRegister }); //call init instance passing this as arugment
631+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, LCOM_TNS_RUNTIME, "initInstance", "VLjava/lang/Object;", new int[] { thisRegister }); //call init instance passing this as arugment
632632
mv.visitLabel(label);
633633
}
634634

@@ -789,7 +789,7 @@ private void generateCallOverrideBlock(MethodVisitor mv, Method method, int this
789789
mv.visitTypeInsn(org.ow2.asmdex.Opcodes.INSN_CONST_CLASS, 2, 0, 0, getClassSignatureOfType(returnType));
790790
}
791791

792-
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, platformClass, callJSMethodName, callJsMethodSignatureMethod, new int[] { thisRegister, 1, 2, 0 });
792+
mv.visitMethodInsn(org.ow2.asmdex.Opcodes.INSN_INVOKE_STATIC, runtimeClass, callJSMethodName, callJsMethodSignatureMethod, new int[] { thisRegister, 1, 2, 0 });
793793

794794
//Label returnLabel = new Label();
795795
//mv.visitLabel(returnLabel);

‎binding-generator/Tester/src/com/proxy/Button1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.lang.reflect.Array;
44

5-
import com.tns.Platform;
5+
import com.tns.Runtime;
66

77
import android.content.Context;
88
import android.util.Log;

binding-generator/Tester/src/com/tns/Platform.java renamed to binding-generator/Tester/src/com/tns/Runtime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import com.tns.runtimebindinggenerator.tester.MethodResolver;
88

9-
public class Platform
9+
public class Runtime
1010
{
1111
public static Object implementationObject;
1212

‎binding-generator/Tester/src/com/tns/runtimebindinggenerator/tester/RuntimeTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.proxy.Button1;
1717
import com.proxy.TargetObject;
1818
import com.tns.NativeScriptHashCodeProvider;
19-
import com.tns.Platform;
19+
import com.tns.Runtime;
2020
import com.tns.bindings.Dump;
2121

2222
import dalvik.system.DexClassLoader;
@@ -117,7 +117,7 @@ private File saveProxy(String name, byte[] proxyBytes) throws IOException
117117

118118
private TargetObject loadProxy(File proxyFile, TargetObject implementationObject) throws Exception
119119
{
120-
Platform.implementationObject = implementationObject;
120+
Runtime.implementationObject = implementationObject;
121121

122122
DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
123123
Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject"+ CLASS_NAME_LOCATION_SEPARATOR + "0");
@@ -130,7 +130,7 @@ private TargetObject loadProxy(File proxyFile, TargetObject implementationObject
130130

131131
private <T> T loadAnyProxy(File proxyFile, T implementationObject) throws Exception
132132
{
133-
Platform.implementationObject = (Object)implementationObject;
133+
Runtime.implementationObject = (Object)implementationObject;
134134

135135
DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
136136
Class<?> clazz = dexClassLoader.loadClass("com.tns.gen." + implementationObject.getClass().getSuperclass().getCanonicalName() + CLASS_NAME_LOCATION_SEPARATOR + "0");
@@ -165,7 +165,7 @@ private <T> T loadAnyProxyByClass(File proxyFile, Class<?> proxyClass) throws Ex
165165

166166
private Button1 loadButton1Proxy(File proxyFile, Button1 implementationObject) throws Exception
167167
{
168-
Platform.implementationObject = implementationObject;
168+
Runtime.implementationObject = implementationObject;
169169

170170
DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
171171
Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.Button1" + CLASS_NAME_LOCATION_SEPARATOR + "0");
@@ -178,7 +178,7 @@ private Button1 loadButton1Proxy(File proxyFile, Button1 implementationObject) t
178178

179179
private TargetObject.TargetInterface loadInterfaceProxy(File proxyFile, TargetObject.TargetInterface implementationObject) throws Exception
180180
{
181-
Platform.implementationObject = implementationObject;
181+
Runtime.implementationObject = implementationObject;
182182

183183
DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
184184
Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject_TargetInterface" + CLASS_NAME_LOCATION_SEPARATOR + "0");

‎build/project-template-gradle/src/main/java/com/tns/Async.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Stack;
1818

1919
import android.app.Application;
20-
import android.content.Context;
2120
import android.graphics.Bitmap;
2221
import android.graphics.BitmapFactory;
2322
import android.os.AsyncTask;

‎build/project-template-gradle/src/main/java/com/tns/ErrorReport.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,7 @@ static String getErrorMessage(Throwable ex)
112112

113113
static Intent getIntent(Context context)
114114
{
115-
Class<?> errorActivityClass = Platform.getErrorActivityClass(); // can be null or can be provided beforehand
116-
117-
// if in debug and errorActivityClass is not provided use ErrorReportActivity class
118-
if (errorActivityClass == null && JsDebugger.isDebuggableApp(context))
119-
{
120-
errorActivityClass = ErrorReportActivity.class;
121-
}
122-
123-
// if not in debug mode should return null and use the errorActivityClass implementation provided
124-
if (errorActivityClass == null)
125-
{
126-
return null;
127-
}
115+
Class<?> errorActivityClass = ErrorReportActivity.class;
128116

129117
Intent intent = new Intent(context, errorActivityClass);
130118

0 commit comments

Comments
 (0)