From fe4abff1068258dc2e1042ccb76b9ef954979a38 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Thu, 21 Jan 2016 12:37:03 -0800 Subject: [PATCH 1/2] delete files in the correct place --- src/android/platform.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/platform.cpp b/src/android/platform.cpp index 54d5ef1b..f91c2b76 100644 --- a/src/android/platform.cpp +++ b/src/android/platform.cpp @@ -22,13 +22,13 @@ std::string default_realm_file_directory() void ensure_directory_exists_for_file(const std::string &fileName) { - std::string cmd = "rm " + s_default_realm_directory + "/*.realm " + - s_default_realm_directory + "/*.realm.lock"; - system(cmd.c_str()); } void remove_realm_files_from_directory(const std::string &directory) { + std::string cmd = "rm " + s_default_realm_directory + "/*.realm " + + s_default_realm_directory + "/*.realm.lock"; + system(cmd.c_str()); } } From b76766eb6315d9c37e44e0c49b430c75e5e2c18c Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Thu, 21 Jan 2016 14:36:50 -0800 Subject: [PATCH 2/2] change package/app name from Demo to ReactNative Test App --- tests/react-test-app/android/app/build.gradle | 2 +- tests/react-test-app/android/app/src/main/AndroidManifest.xml | 2 +- .../android/app/src/main/java/{com/demo => }/MainActivity.java | 2 +- .../react-test-app/android/app/src/main/res/values/strings.xml | 2 +- tests/react-test-app/android/settings.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename tests/react-test-app/android/app/src/main/java/{com/demo => }/MainActivity.java (98%) diff --git a/tests/react-test-app/android/app/build.gradle b/tests/react-test-app/android/app/build.gradle index 2619a983..0ede36f9 100644 --- a/tests/react-test-app/android/app/build.gradle +++ b/tests/react-test-app/android/app/build.gradle @@ -54,7 +54,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - applicationId "com.demo" + applicationId "io.realm.reactnative.testapp" minSdkVersion 16 targetSdkVersion 22 versionCode 1 diff --git a/tests/react-test-app/android/app/src/main/AndroidManifest.xml b/tests/react-test-app/android/app/src/main/AndroidManifest.xml index 0e125e42..99a117c1 100644 --- a/tests/react-test-app/android/app/src/main/AndroidManifest.xml +++ b/tests/react-test-app/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="io.realm.reactnative.testapp"> diff --git a/tests/react-test-app/android/app/src/main/java/com/demo/MainActivity.java b/tests/react-test-app/android/app/src/main/java/MainActivity.java similarity index 98% rename from tests/react-test-app/android/app/src/main/java/com/demo/MainActivity.java rename to tests/react-test-app/android/app/src/main/java/MainActivity.java index 749d9146..71cb5697 100644 --- a/tests/react-test-app/android/app/src/main/java/com/demo/MainActivity.java +++ b/tests/react-test-app/android/app/src/main/java/MainActivity.java @@ -1,4 +1,4 @@ -package com.demo; +package io.realm.reactnative.testapp; import android.app.Activity; import android.os.Bundle; diff --git a/tests/react-test-app/android/app/src/main/res/values/strings.xml b/tests/react-test-app/android/app/src/main/res/values/strings.xml index b2250a86..93eb224f 100644 --- a/tests/react-test-app/android/app/src/main/res/values/strings.xml +++ b/tests/react-test-app/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Demo + ReactNative Test App diff --git a/tests/react-test-app/android/settings.gradle b/tests/react-test-app/android/settings.gradle index 673b698c..d3c183b8 100644 --- a/tests/react-test-app/android/settings.gradle +++ b/tests/react-test-app/android/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'Demo' +rootProject.name = 'ReactNative Test App' include ':app'