Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / src / vicar-utils / cpp / main.cpp

diff --git a/src/vicar-utils/cpp/main.cpp b/src/vicar-utils/cpp/main.cpp
index a5a19da..cd295ff 100755 (executable)
--- a/src/vicar-utils/cpp/main.cpp
+++ b/src/vicar-utils/cpp/main.cpp
@@ -10,10 +10,32 @@
 #include "connectioninterfacerequeststypes.h"
 #include "harmattanaccountutility.h"
 #include <QDebug>
+<<<<<<< HEAD
+#include <QCoreApplication>
+#include "dbusutility.h"
+#include <QDBusMetaType>
+#include <QDBusConnection>
+#include <QCryptographicHash> //DEBUG
+
+
+#include <QDBusInterface>
+#include <QDBusObjectPath>
+#include <QDBusArgument>
+
+#define AM_SERVICE          "org.freedesktop.Telepathy.AccountManager"
+#define AM_OBJ_PATH         "/org/freedesktop/Telepathy/AccountManager"
+#define AM_INTERFACE        "org.freedesktop.Telepathy.AccountManager"
+#define RING_CONN_SERVICE   "org.freedesktop.Telepathy.Connection.ring.tel.ring"
+#define RING_CONN_PATH      "/org/freedesktop/Telepathy/Connection/ring/tel/ring"
+#define DBUS_SERVICE        "org.freedesktop.DBus.Properties"
+#define DBUS_OBJ_PATH       "/org/freedesktop/DBus/Properties"
+#define DBUS_PROPS_IFACE     "org.freedesktop.DBus.Properties"
+=======
 #include <QCoreApplication> //DEBUG - Delete this
 #include "dbusutility.h"
 #include <QDBusMetaType>
 #include <QDBusConnection>
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 
 int main(int argc, char *argv[])
 {
@@ -37,7 +59,7 @@ int main(int argc, char *argv[])
     if (argc > 1 && argv[1]){
         QString instruction = QString(argv[1]);
         if (instruction == "INSTALL"){
-            //Check if Account already exists
+            //Check if Account already exists                                                            
             if (!tpUtility->accountExists()){
                 qDebug() << "VICaR account not found. Creating ..";
                 bool result = tpUtility->createAccount();
@@ -51,39 +73,59 @@ int main(int argc, char *argv[])
             bool result = tpUtility->deleteAccount();
             if (!result) exit(2);
         }
-
+        else if (instruction == "TESTING"){
+            tpUtility->callNumberWithRing(argv[2]);
+        }
+        else if (instruction == "TPACCOUNTSTATUS"){
+            QString status = tpUtility->getAccountStatus();
+            qDebug() << "Account Status is "<< status;
+        }
+#if defined(Q_WS_MAEMO_5)
         else if (instruction == "CREATEDB"){
             bool result = databaseUtility->openDatabase();
             if (!result){
-                qDebug() <<"Error creating profiles database. "
+                qDebug() <<"Error creating vicar database. "
                         <<databaseUtility->lastError();
                 exit(3);
             }
-            qDebug() << "VICaR profiles database opened.";
-
-            if (!databaseUtility->tableExists("profiles")){
-                qDebug() << "Creating VICaR profiles table..";
-                result = databaseUtility->createProfilesTable();
-                if (!result){
-                    qDebug() <<"Error creating profiles table. "
-                            <<databaseUtility->lastError();
-                    exit(4);
-                }
-            }
-            else{
-                qDebug()<<"Profiles table exists";
+
+            qDebug() << "VICaR database opened.";
+            qDebug() << "Preparing VICaR tables..";
+            result = databaseUtility->prepareTables();
+            if (!result){
+                qDebug() <<"Error creating tables. "
+                        <<databaseUtility->lastError();
+                exit(4);
             }
+
             databaseUtility->closeDatabase();
         }
         else if (instruction == "DROPDB"){
             bool result = databaseUtility->deleteDatabase();
             if (!result){
-                qDebug() <<"Error deleting profiles database. "
+                qDebug() <<"Error deleting vicar database. "
                         <<databaseUtility->lastError();
                 exit(5);
             }
-            qDebug() << "VICaR profiles database deleted.";
+            qDebug() << "VICaR database deleted.";
+        }    
+#elif defined(Q_WS_MAEMO_6)
+        else if (instruction == "--create-account"){
+            qDebug() << "Creating account";
+            accountUtility->addAccount();
         }
+<<<<<<< HEAD
+        else if (instruction == "--delete-account"){
+            qDebug() << "Deleting account";
+            accountUtility->removeAccount();
+        }
+#endif
+        else {
+            qDebug() << "This command is not recognized";
+        }
+    }
+    else{                        
+=======
         else if (instruction == "TPACCOUNTSTATUS"){
             QString status = tpUtility->getAccountStatus();
             qDebug() << "Account Status is "<< status;
@@ -142,7 +184,11 @@ int main(int argc, char *argv[])
         }
         app.exec();
     }
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
+
+        qDebug() << QCryptographicHash::hash("VICaR",QCryptographicHash::Md5).toHex();
 
+    }
     delete (tpUtility);
     delete (databaseUtility);
     delete (accountUtility);