aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Software/Android_Studio/Tango.DAL/build.gradle2
-rw-r--r--Software/Android_Studio/Tango.DAL/src/main/assets/Tango.dbbin0 -> 446464 bytes
-rw-r--r--Software/Android_Studio/Tango.DAL/src/main/assets/mobile.dbbin24576 -> 0 bytes
-rw-r--r--Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/db/AppDataBase.java4
-rw-r--r--Software/DB/Tango.dbbin0 -> 446464 bytes
-rw-r--r--Software/DB/Tango.mdfbin8388608 -> 8388608 bytes
-rw-r--r--Software/DB/Tango_log.ldfbin8388608 -> 8388608 bytes
-rw-r--r--Software/DB/mobile.dbbin24576 -> 0 bytes
8 files changed, 3 insertions, 3 deletions
diff --git a/Software/Android_Studio/Tango.DAL/build.gradle b/Software/Android_Studio/Tango.DAL/build.gradle
index ccdda3e4c..066a1efbd 100644
--- a/Software/Android_Studio/Tango.DAL/build.gradle
+++ b/Software/Android_Studio/Tango.DAL/build.gradle
@@ -45,7 +45,7 @@ dependencies {
//Copy data base to assets folder.
task copyFiles(type: Copy) {
- from "$projectDir\\..\\..\\DB\\mobile.db"
+ from "$projectDir\\..\\..\\DB\\Tango.db"
into "$projectDir/src\\main\\assets\\"
}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/assets/Tango.db b/Software/Android_Studio/Tango.DAL/src/main/assets/Tango.db
new file mode 100644
index 000000000..a0b28abd7
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/assets/Tango.db
Binary files differ
diff --git a/Software/Android_Studio/Tango.DAL/src/main/assets/mobile.db b/Software/Android_Studio/Tango.DAL/src/main/assets/mobile.db
deleted file mode 100644
index 7b73a6ed5..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/assets/mobile.db
+++ /dev/null
Binary files differ
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/db/AppDataBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/db/AppDataBase.java
index b0a9f6a9f..b1124c6ab 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/db/AppDataBase.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/db/AppDataBase.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
public abstract class AppDataBase extends RoomDatabase
{
private static String DB_PATH = "/data/data/com.twine.tango.dal.test/databases/";
- private static String DB_NAME = "mobile";
+ private static String DB_NAME = "Tango";
private static AppDataBase INSTANCE;
@@ -63,7 +63,7 @@ public abstract class AppDataBase extends RoomDatabase
private static void copyDefaultDB(Context context) throws Exception
{
//Open your local db as the input stream
- InputStream myInput = context.getAssets().open("mobile.db");
+ InputStream myInput = context.getAssets().open(DB_NAME + ".db");
//Open the empty db as the output stream
OutputStream myOutput = new FileOutputStream(DB_PATH);
diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db
new file mode 100644
index 000000000..a0b28abd7
--- /dev/null
+++ b/Software/DB/Tango.db
Binary files differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 2331eb7ba..4e7df2ba3 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
Binary files differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index c39e5c99b..b1d387d73 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
Binary files differ
diff --git a/Software/DB/mobile.db b/Software/DB/mobile.db
deleted file mode 100644
index 7b73a6ed5..000000000
--- a/Software/DB/mobile.db
+++ /dev/null
Binary files differ