Skip to content

Update project template in order to execute Runtime.run() method at t… #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2016
Merged

Update project template in order to execute Runtime.run() method at t… #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ffb08
Update project template in order to execute Runtime.run() method at t…
Jun 27, 2016
ffc5a2e
Use static method initRuntime instead of instance one
Jun 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...t-template-gradle/build-tools/android-static-binding-generator/staticbindinggenerator.jar
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public NativeScriptApplication() {

public void onCreate() {
super.onCreate();
new RuntimeHelper(this).initRuntime();
com.tns.Runtime runtime = RuntimeHelper.initRuntime(this);
if (runtime !=null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this check should not be needed

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check is needed, for example when showing error activity.

runtime.run();
}
}

public static Application getInstance() {
Expand Down
31 changes: 14 additions & 17 deletions build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@
import android.util.Log;
import java.io.IOException;

public class RuntimeHelper {
private final Application app;

public RuntimeHelper(Application app) {
this.app = app;
}
public final class RuntimeHelper {
private RuntimeHelper() {}

// hasErrorIntent tells you if there was an event (with an uncaught
// exception) raised from ErrorReport
public boolean hasErrorIntent() {
public static boolean hasErrorIntent(Application app) {
boolean hasErrorIntent = false;

try {
Expand All @@ -38,18 +34,19 @@ public boolean hasErrorIntent() {
return hasErrorIntent;
}

public void initRuntime()
public static Runtime initRuntime(Application app)
{
if (Runtime.isInitialized()) {
return;
return Runtime.getCurrentRuntime();
}

System.loadLibrary("NativeScript");

Runtime runtime = null;
Logger logger = new LogcatLogger(app);
Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;
Debugger debugger = AndroidJsDebugger.isDebuggableApp(app) ? new AndroidJsDebugger(app, logger) : null;

boolean showErrorIntent = hasErrorIntent();
boolean showErrorIntent = hasErrorIntent(app);
if (!showErrorIntent) {
NativeScriptUncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, app);

Expand Down Expand Up @@ -110,12 +107,12 @@ public void initRuntime()
ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
appDir, classLoader, dexDir, dexThumb, v8Config);
Runtime runtime = new Runtime(config);
runtime = new Runtime(config);

exHandler.setRuntime(runtime);

if (NativeScriptSyncService.isSyncEnabled(this.app)) {
NativeScriptSyncService syncService = new NativeScriptSyncService(runtime, logger, this.app);
if (NativeScriptSyncService.isSyncEnabled(app)) {
NativeScriptSyncService syncService = new NativeScriptSyncService(runtime, logger, app);

syncService.sync();
syncService.startServer();
Expand All @@ -141,14 +138,14 @@ public void initRuntime()

try {
// put this call in a try/catch block because with the latest changes in the modules it is not granted that NativeScriptApplication is extended through JavaScript.
Runtime.initInstance(this.app);
Runtime.initInstance(app);
}
catch (Exception e) {

}
runtime.run();
}
return runtime;
}

private final String logTag = "MyApp";
private static final String logTag = "MyApp";
}
2 changes: 1 addition & 1 deletion runtime/src/main/java/com/tns/Runtime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public int getRuntimeId()
return this.runtimeId;
}

private static Runtime getCurrentRuntime()
public static Runtime getCurrentRuntime()
{
Runtime runtime = currentRuntime.get();

Expand Down
5 changes: 4 additions & 1 deletion test-app/app/src/main/java/com/tns/NativeScriptApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public NativeScriptApplication() {

public void onCreate() {
super.onCreate();
new RuntimeHelper(this).initRuntime();
com.tns.Runtime runtime = RuntimeHelper.initRuntime(this);
if (runtime !=null) {
runtime.run();
}
}

public static Application getInstance() {
Expand Down
30 changes: 14 additions & 16 deletions test-app/app/src/main/java/com/tns/RuntimeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@
import android.util.Log;
import java.io.IOException;

public class RuntimeHelper {
private final Application app;

public RuntimeHelper(Application app) {
this.app = app;
public final class RuntimeHelper {
private RuntimeHelper() {
}

// hasErrorIntent tells you if there was an event (with an uncaught
// exception) raised from ErrorReport
public boolean hasErrorIntent() {
private static boolean hasErrorIntent(Application app) {
boolean hasErrorIntent = false;

try {
Expand All @@ -38,18 +35,19 @@ public boolean hasErrorIntent() {
return hasErrorIntent;
}

public void initRuntime()
public static Runtime initRuntime(Application app)
{
if (Runtime.isInitialized()) {
return;
return Runtime.getCurrentRuntime();
}

System.loadLibrary("NativeScript");

Logger logger = new LogcatLogger(app);
Debugger debugger = AndroidJsDebugger.isDebuggableApp(this.app) ? new AndroidJsDebugger(app, logger) : null;
Debugger debugger = AndroidJsDebugger.isDebuggableApp(app) ? new AndroidJsDebugger(app, logger) : null;

boolean showErrorIntent = hasErrorIntent();
Runtime runtime = null;
boolean showErrorIntent = hasErrorIntent(app);
if (!showErrorIntent) {
NativeScriptUncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, app);

Expand Down Expand Up @@ -110,12 +108,12 @@ public void initRuntime()
ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
appDir, classLoader, dexDir, dexThumb, v8Config);
Runtime runtime = new Runtime(config);
runtime = new Runtime(config);

exHandler.setRuntime(runtime);

if (NativeScriptSyncService.isSyncEnabled(this.app)) {
NativeScriptSyncService syncService = new NativeScriptSyncService(runtime, logger, this.app);
if (NativeScriptSyncService.isSyncEnabled(app)) {
NativeScriptSyncService syncService = new NativeScriptSyncService(runtime, logger, app);

syncService.sync();
syncService.startServer();
Expand All @@ -141,14 +139,14 @@ public void initRuntime()

try {
// put this call in a try/catch block because with the latest changes in the modules it is not granted that NativeScriptApplication is extended through JavaScript.
Runtime.initInstance(this.app);
Runtime.initInstance(app);
}
catch (Exception e) {

}
runtime.run();
}
return runtime;
}

private final String logTag = "MyApp";
private static final String logTag = "MyApp";
}