From ef2eb5f3c0835a0cc2dccb8e199faa26b720ec3b Mon Sep 17 00:00:00 2001
From: dubslow <dubslow@users.noreply.github.com>
Date: Wed, 3 Sep 2014 05:22:29 -0500
Subject: [PATCH 1/5] Update buildPackages.sh

---
 tools/buildPackages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index d0ec345c0..dc01f4a82 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Config (Update me if needed !)
-VERSION_UPSTREAM="0.01pre-alpha"
+VERSION_UPSTREAM="1.0"
 VERSION_PACKAGE="1"
 PACKAGENAME="qtox"
 UPSTREAM_URL="https://github.com/tux3/qTox/archive/master.tar.gz"

From 69b2befe6ffc152a7a28b01c48faa4dc39b2da70 Mon Sep 17 00:00:00 2001
From: dubslow <dubslow@users.noreply.github.com>
Date: Wed, 3 Sep 2014 05:22:41 -0500
Subject: [PATCH 2/5] Update changelog

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b1593c67..1b56f518a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtox (0.01pre-alpha-1) UNRELEASED; urgency=medium local package
+qtox (1.0-1) UNRELEASED; urgency=medium local package
 
   * Initial release.
 

From 7576795cca4cada77647866d83cdabe52ff1d4e0 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Thu, 4 Sep 2014 22:28:34 +0200
Subject: [PATCH 3/5] Update DHT bootstrap list

---
 res/settings.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/settings.ini b/res/settings.ini
index 25d126190..e335c7c8d 100644
--- a/res/settings.ini
+++ b/res/settings.ini
@@ -1,6 +1,6 @@
 [DHT%20Server]
 dhtServerList\size=9
-dhtServerList\1\name=stqism
+dhtServerList\1\name=Nikolai Toryzin
 dhtServerList\1\userId=951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
 dhtServerList\1\address=192.254.75.98
 dhtServerList\1\port=33445
@@ -36,3 +36,7 @@ dhtServerList\9\name=SylvieLorxu
 dhtServerList\9\userId=4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057
 dhtServerList\9\address=178.21.112.187
 dhtServerList\9\port=33445
+dhtServerList\10\name=Unknown (uTox)
+dhtServerList\10\userId=7187969BB10B54C98538BAE94C069CE5C84E650D54F7E596543D8FB1ECF4CF23
+dhtServerList\10\address=95.85.13.245
+dhtServerList\10\port=33445

From bf8e1101c5b64e1081418b820bc2da5771db4f08 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Thu, 4 Sep 2014 23:11:46 +0200
Subject: [PATCH 4/5] Fix Make Tox Portable impossible to disable

---
 settings.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/settings.cpp b/settings.cpp
index 92841f4f7..a9461cd15 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -48,13 +48,19 @@ Settings& Settings::getInstance()
 
 void Settings::load()
 {
-    if (loaded) {
+    if (loaded)
         return;
-    }
 
     QFile portableSettings(FILENAME);
     if (portableSettings.exists())
-        makeToxPortable=true;
+    {
+        QSettings ps(FILENAME, QSettings::IniFormat);
+        ps.beginGroup("General");
+            makeToxPortable = ps.value("makeToxPortable", false).toBool();
+        ps.endGroup();
+    }
+    else
+        makeToxPortable = false;
 
     QString filePath = QDir(getSettingsDirPath()).filePath(FILENAME);
 

From 86ca598a483b066520e77b5c43ea322196b61311 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Thu, 4 Sep 2014 23:13:59 +0200
Subject: [PATCH 5/5] Option to use custom list of bootstrap nodes

False by default, to allow for auto-updates and fix problems with people who can't connect to the DHT due to the old list not being updated and not working
---
 core.cpp     |  4 ++--
 settings.cpp | 57 +++++++++++++++++++++++++++++++++++++++++-----------
 settings.h   |  1 +
 3 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/core.cpp b/core.cpp
index 37455d4e3..de5dc66ee 100644
--- a/core.cpp
+++ b/core.cpp
@@ -882,7 +882,8 @@ void Core::saveConfiguration()
         return;
     }
 
-    qDebug() << "Core: writing tox_save";
+        qDebug() << "Core: Saving";
+
     uint32_t fileSize = tox_size(tox);
     if (fileSize > 0 && fileSize <= INT32_MAX) {
         uint8_t *data = new uint8_t[fileSize];
@@ -892,7 +893,6 @@ void Core::saveConfiguration()
         delete[] data;
     }
 
-    qDebug() << "Core: writing settings";
     Settings::getInstance().save();
 }
 
diff --git a/settings.cpp b/settings.cpp
index a9461cd15..01c6bed2c 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -30,7 +30,7 @@ const QString Settings::FILENAME = "settings.ini";
 bool Settings::makeToxPortable{false};
 
 Settings::Settings() :
-    loaded(false)
+    loaded(false), useCustomDhtList{false}
 {
     load();
 }
@@ -48,8 +48,9 @@ Settings& Settings::getInstance()
 
 void Settings::load()
 {
-    if (loaded)
+    if (loaded) {
         return;
+    }
 
     QFile portableSettings(FILENAME);
     if (portableSettings.exists())
@@ -71,19 +72,28 @@ void Settings::load()
         filePath = ":/conf/" + FILENAME;
     }
 
+    qDebug() << "Settings: Loading from "<<filePath;
+
     QSettings s(filePath, QSettings::IniFormat);
     s.beginGroup("DHT Server");
-        int serverListSize = s.beginReadArray("dhtServerList");
-        for (int i = 0; i < serverListSize; i ++) {
-            s.setArrayIndex(i);
-            DhtServer server;
-            server.name = s.value("name").toString();
-            server.userId = s.value("userId").toString();
-            server.address = s.value("address").toString();
-            server.port = s.value("port").toInt();
-            dhtServerList << server;
+        if (s.value("useCustomList").toBool())
+        {
+            useCustomDhtList = true;
+            qDebug() << "Using custom bootstrap nodes list";
+            int serverListSize = s.beginReadArray("dhtServerList");
+            for (int i = 0; i < serverListSize; i ++) {
+                s.setArrayIndex(i);
+                DhtServer server;
+                server.name = s.value("name").toString();
+                server.userId = s.value("userId").toString();
+                server.address = s.value("address").toString();
+                server.port = s.value("port").toInt();
+                dhtServerList << server;
+            }
+            s.endArray();
         }
-        s.endArray();
+        else
+            useCustomDhtList=false;
     s.endGroup();
 
     friendAddresses.clear();
@@ -137,6 +147,26 @@ void Settings::load()
     if (!SmileyPack::isValid(smileyPack) && !SmileyPack::listSmileyPacks().isEmpty())
         smileyPack = SmileyPack::listSmileyPacks()[0].second;
 
+    // Read the embedded DHT bootsrap nodes list if needed
+    if (dhtServerList.isEmpty())
+    {
+        qDebug() << "Using embeded bootstrap nodes list";
+        QSettings rcs(":/conf/settings.ini", QSettings::IniFormat);
+        rcs.beginGroup("DHT Server");
+            int serverListSize = rcs.beginReadArray("dhtServerList");
+            for (int i = 0; i < serverListSize; i ++) {
+                rcs.setArrayIndex(i);
+                DhtServer server;
+                server.name = rcs.value("name").toString();
+                server.userId = rcs.value("userId").toString();
+                server.address = rcs.value("address").toString();
+                server.port = rcs.value("port").toInt();
+                dhtServerList << server;
+            }
+            rcs.endArray();
+        rcs.endGroup();
+    }
+
     loaded = true;
 }
 
@@ -148,11 +178,14 @@ void Settings::save()
 
 void Settings::save(QString path)
 {
+    qDebug() << "Settings: Saving in "<<path;
+
     QSettings s(path, QSettings::IniFormat);
 
     s.clear();
 
     s.beginGroup("DHT Server");
+        s.setValue("useCustomList", useCustomDhtList);
         s.beginWriteArray("dhtServerList", dhtServerList.size());
         for (int i = 0; i < dhtServerList.size(); i ++) {
             s.setArrayIndex(i);
diff --git a/settings.h b/settings.h
index 819e89a21..8ea767615 100644
--- a/settings.h
+++ b/settings.h
@@ -142,6 +142,7 @@ private:
 
     bool loaded;
 
+    bool useCustomDhtList;
     QList<DhtServer> dhtServerList;
     int dhtServerId;
     bool dontShowDhtDialog;