From 6528de05337595754260b058c63a1e1b338c6b69 Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 27 Dec 2013 14:06:40 +0100
Subject: [PATCH] add insert-sql-android.sh (convenient way to add SQL data
 into android DB)

---
 insert-sql-android.sh | 11 +++++++++++
 mainwindow.cpp        |  2 +-
 set-android-db.sh     |  7 ++++++-
 ui.sql                |  6 +++---
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100755 insert-sql-android.sh

diff --git a/insert-sql-android.sh b/insert-sql-android.sh
new file mode 100755
index 0000000..82dd894
--- /dev/null
+++ b/insert-sql-android.sh
@@ -0,0 +1,11 @@
+export DB=/data/data/eu.nothing2do.diary-mobile/files/db
+adb pull $DB
+echo "$DB file retreived"
+cat $1|sqlite3 db
+echo "db file populated"
+adb push db /storage/sdcard1
+echo "file db copied to /storage/sdcard1"
+adb shell su -c mv /storage/sdcard1/db $DB
+echo "file mv'ed to the right place"
+adb shell su -c chown u0_a12:u0_a12 $DB
+echo "file chown'ed"
diff --git a/mainwindow.cpp b/mainwindow.cpp
index cd460d6..44c6e8f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -130,7 +130,7 @@ CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
     signalmap->setMapping(a, key);
     return a;
 }
-void MainWindow::action(const QString & a){
+void MainWindow::action(const QString &a){
     qDebug()<<"action("<<a<<")";
 
     flush();
diff --git a/set-android-db.sh b/set-android-db.sh
index bce6d81..1251a3c 100755
--- a/set-android-db.sh
+++ b/set-android-db.sh
@@ -1,2 +1,7 @@
-echo '.read ui.sql'|sqlite3 db
+cat $1|sqlite3 db
 adb push db /sdcard/db
+echo "file db copied to /sdcard/db"
+adb shell su -c mv /sdcard/db /data/data/eu.nothing2do.eu-diarymobile
+echo "file mv'ed to the right place"
+adb shell su -c chown u0_a12:u0_a12 /data/data/eu.nothing2do.diarymobile/files/db
+echo "file chown'ed"
diff --git a/ui.sql b/ui.sql
index 7f3e7cb..fc44ef9 100644
--- a/ui.sql
+++ b/ui.sql
@@ -23,9 +23,9 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','max column','setint m
 INSERT INTO "ui" (keyword, label, action) VALUES('config','host','settext host 127.0.0.1');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','port','setint port port 5432');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','user','settext user root');
-INSERT INTO "ui" (keyword, label, action) VALUES('config','password','settext pass 123456789');
-INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext db database');
-INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','setfile file');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','password','settext pass');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext db');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','settext file');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settext SQLsettings requiressl=1 connect_timeout=10000');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','button', 'settext button background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','fichier SQL', 'setfile sqlfile ui.sql');
-- 
2.45.1