README update

.cmake-format.yaml

@@ -0,0 +1,9 @@
+bullet_char: '*'
+dangle_parens: false
+enum_char: .
+line_ending: unix
+line_width: 120
+max_pargs_hwrap: 3
+separate_ctrl_name_with_space: true
+separate_fn_name_with_space: false
+tab_size: 4

.editorconfig

@@ -0,0 +1,3 @@
+[*.{sh,yml,yaml}]
+indent_style = space
+indent_size = 2

.gitignore

@@ -1,33 +1,40 @@
+# Build files
 Makefile
 Makefile.*
-*.user
-*.user.*
+CMakeLists.txt.user
+build/
 debug
 release
-*.pdb
-*.app
-.packagingrc
-.qmake.stash
-.qmake.cache
-.DS_Store
+
+# Build artifacts
 *.exe
 *.dll
+*.pdb
+*.so
+*.a
 *.o
+*.app
+*.dylib
 *.moc
-tests/*/tst_*
-!tst_*.pro
-!tst_*.cpp
-!tst_*.h
+
+# Generated source files (These should always end up in the build dir anyway)
 *.pb.h
 *.pb.cc
-packaging/installer/Qt
-packaging/installer/Output
-translation/*.qm
+moc_*.cpp
+moc_predefs.h
+qrc_*.cpp
+
+# Generated translations
+*.qm
+
+# Other
+*.user
+*.user.*
+.DS_Store
+.packagingrc
+.vscode/
+
+# Ricochet files (when running in the root dir)
 config
 config.ricochet
-config.log
-config.tests/*/*
-!config.tests/*/*.pro
-!config.tests/*/*.cpp
-!config.tests/*/*.h
-ricochet
+

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/extern/fmt"]
+	path = src/extern/fmt
+	url = https://github.com/fmtlib/fmt.git
+[submodule "src/extern/tor"]
+	path = src/extern/tor
+	url = https://git.torproject.org/tor.git

.travis.yml

@@ -1,31 +1,102 @@
 language: cpp
-dist: trusty
+dist: bionic
 sudo: required
-
-os:
-  - linux
-  - osx
-
+git:
+  submodules: false
 env:
-  - CONFIG=Debug
-    #  - CONFIG=Release
+  global:
+  - HEADLESS=True
+  - SKIP_CODESIGN=1
+  - CONFIG=Release
+matrix:
+  include:
+  - os: osx
+    env:
+    - BUILD_TARGET=osx
+    - USE_LOCAL_QT=YES
+    - USE_LOCAL_PROTOBUF=YES
+  - os: linux
+    env:
+    - BUILD_TARGET=linux-static
+    # - USE_LOCAL_QT=YES
+addons:
+  homebrew:
+    packages:
+    - qt5
+    - protobuf
+    - pkg-config
+    update: true
+  apt:
+    packages:
+    - automake
+    - autotools-dev
+    - build-essential
+    - ca-certificates
+    - curl
+    - git
+    - libasound2-dev
+    - libevent-dev
+    - libfontconfig1
+    - libfontconfig1-dev
+    - libfreetype6
+    - libfreetype6-dev
+    - libglu1-mesa-dev
+    - libprotobuf-dev
+    - libprotobuf-dev
+    - libqt5gui5
+    - libqt5opengl5
+    - libqt5opengl5-dev
+    - libqt5svg5
+    - libssl-dev
+    - libtool
+    - libx11-xcb-dev
+    - '^libxcb.*'
+    - '^libxkb.*'
+    - libxrender-dev
+    - libxrender1
+    - pkg-config
+    - protobuf-compiler
+    - python
+    - qt5-default
+    - qt5-qmake
+    - qtbase5-dev
+    - qtdeclarative5-dev
+    - qttools5-dev-tools
+    - tor
+    - unzip
+    - vim
+    - xkb-data
+    - xvfb
+    - zip
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-         sudo apt-get update
-      && sudo apt-get install -qq libssl-dev libprotobuf-dev protobuf-compiler
-      && sudo apt-get install -qq qt5-qmake qt5-default qtbase5-dev qttools5-dev-tools qtdeclarative5-dev
-      ;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-         brew update
-      && brew install qt5
-      && brew install protobuf
-      && brew install openssl
-      ;
-    fi
-
+- (cd buildscripts && "${BUILD_TARGET}/build-deps.sh")
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then qmake -qt=qt5 CONFIG+=$CONFIG; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then /usr/local/opt/qt5/bin/qmake CONFIG+=$CONFIG OPENSSLDIR=/usr/local/opt/openssl PROTOBUFDIR=/usr/local/opt/protobuf; fi
-  - make
+- (cd buildscripts && "${BUILD_TARGET}/test.sh")
+- (cd buildscripts && "${BUILD_TARGET}/build.sh")
+- export BUILD_NAME=$(cd buildscripts && "./get_build_name.sh")
+deploy:
+  - provider: releases
+    name: DRAFT ${BUILD_NAME}
+    api_key:
+      secure: lIHMpIYSRcQAzFnbKeucjndUCzCVH78CZ7JpgB7BpUSO/F61ngdW9oWy8oJWdMb1JU0efSRRYNXbX4lTVBOS/iueqfoL6jNojT7t8yVgM31ZfnzJipqdtUHBDHHUHDEQez7MXudUpa9Zo6yCoHF8IT30NiKErbi7jG5YIEaxYzMR2ICWSkechFbGwe6nFgVW8iceNBW8GyyeBpkII7arTpJbZZlrcWDh+Ej5r6fHivV7oifuhSZ6VUYT3dB0tOqcHPU8OtnFpq1sQOtNwr+KNBEfBGLd+gyCXTdjmUebBXnSI6nR3hKEEQR87znlqFrzYKq2OwXqtYkTtc7MpSbmzH9bfxqC4WUa/8QL77cgLJWzhAaOe6+nqeadEJFEFB31KLOlt2SbsMyBy2xWi+NS43VOVz6FecbhgODq7QpXBN5kvN6kjc5kc7xY8joQW5k939/kN5P4DfpePd//bvmUzCVdYaak2pPKLzsyY5dXGqk7z3lGVE3h5Q+8EOnbsEvSrbhNF+Svm/FAEbjUMnaAx20o66MxPxvbb+I0iNT72+jqJypZLv5mjkw2ItMJR1G5zD95qxgZakzJ3liSSpGROBzpLSGQb8GQpOktY9UzocIM0pqyawg2Hfn6y1D9Ptp1SfOZ8rFJvqI+Mxv3FFp+lD3tOV6MvFj1+EJ8PiHyIQc=
+    skip_cleanup: true
+    file_glob: true
+    file:
+    - 'buildscripts/output/Ricochet-Refresh-*.dmg'
+    - 'buildscripts/output/ricochet-refresh-*-static.tar.bz2'
+    overwrite: true
+    draft: true
+  - provider: releases
+    name: PRERELEASE ${BUILD_NAME}
+    api_key:
+      secure: lIHMpIYSRcQAzFnbKeucjndUCzCVH78CZ7JpgB7BpUSO/F61ngdW9oWy8oJWdMb1JU0efSRRYNXbX4lTVBOS/iueqfoL6jNojT7t8yVgM31ZfnzJipqdtUHBDHHUHDEQez7MXudUpa9Zo6yCoHF8IT30NiKErbi7jG5YIEaxYzMR2ICWSkechFbGwe6nFgVW8iceNBW8GyyeBpkII7arTpJbZZlrcWDh+Ej5r6fHivV7oifuhSZ6VUYT3dB0tOqcHPU8OtnFpq1sQOtNwr+KNBEfBGLd+gyCXTdjmUebBXnSI6nR3hKEEQR87znlqFrzYKq2OwXqtYkTtc7MpSbmzH9bfxqC4WUa/8QL77cgLJWzhAaOe6+nqeadEJFEFB31KLOlt2SbsMyBy2xWi+NS43VOVz6FecbhgODq7QpXBN5kvN6kjc5kc7xY8joQW5k939/kN5P4DfpePd//bvmUzCVdYaak2pPKLzsyY5dXGqk7z3lGVE3h5Q+8EOnbsEvSrbhNF+Svm/FAEbjUMnaAx20o66MxPxvbb+I0iNT72+jqJypZLv5mjkw2ItMJR1G5zD95qxgZakzJ3liSSpGROBzpLSGQb8GQpOktY9UzocIM0pqyawg2Hfn6y1D9Ptp1SfOZ8rFJvqI+Mxv3FFp+lD3tOV6MvFj1+EJ8PiHyIQc=
+    skip_cleanup: true
+    file_glob: true
+    file:
+    - 'buildscripts/output/Ricochet-Refresh-*.dmg'
+    - 'buildscripts/output/ricochet-refresh-*-static.tar.bz2'
+    on:
+      tags: true
+    overwrite: true
+    prerelease: true

AUTHORS.md

@@ -1,6 +1,9 @@
 ### Development
 * John Brooks (@special) `<[email protected]>`
-
+* Derwent Mcelhinney (@derwentx)
+* Peter Tonoli (@petertonoli)
+* Richard Pospesel (richard on #tor-dev @OFTC) `<[email protected]>`
+* Marco Simonelli (msim on #tor-dev @OFTC) `<[email protected]>`
 ### Sponsors
 * Blueprint for Free Speech - https://blueprintforfreespeech.net/
 

BUILDING.md

@@ -1,16 +1,45 @@
-## Building Ricochet
+## New Building
 
-These instructions are intended for people who wish to build or modify Ricochet from source. Most users should [download releases](https://github.com/ricochet-im/ricochet/releases) instead.
+Cloning must be done with `--recurse-submodules`:
 
-Clone with git from `https://github.com/ricochet-im/ricochet.git`, or download source packages [on github](https://github.com/ricochet-im/ricochet/releases). Then proceed to instructions for your platform.
+```sh
+git clone --recurse-submodules https://github.com/blueprint-freespeech/ricochet-refresh.git
+```
+In the event that you cloned the repo without fetching the submodules, you can still get them with:
+```sh
+git submodule --init --update
+```
+
+Later, you should update your local repository with:
+```sh
+git pull --recurse-submodules
+```
 
-If you're interested in helping to package Ricochet for common Linux platforms, please get in touch!
+### Linux
 
-## Hints
+Clone
 
-Add `CONFIG+=debug` or `CONFIG+=release` to the qmake command for a debug or release build. Debug builds enable logging to standard output, and shouldn't be used in sensitive environments.
+Download and install the prebuilt Qt 5.15 ( https://www.qt.io/download-qt-installer ) and add bin directory containing 'qmake' to your PATH environment variable.
+
+#### Debian
+
+Install the following development packages:
 
-By default, Ricochet will be portable, and configuration is stored in a folder named `config` next to the binary. Add `DEFINES+=RICOCHET_NO_PORTABLE` to the qmake command for a system-wide installation using platform configuration paths instead.
+```sh
+apt-get install build-essential libssl-dev pkg-config libprotobuf-dev protobuf-compiler libgl-dev
+```
+
+## Building Ricochet Refresh
+
+These instructions are intended for people who wish to build or modify Ricochet Refresh from source. Most users should [download releases](https://github.com/blueprint-freespeech/ricochet-refresh/releases) instead.
+
+Clone with git from `https://github.com/blueprint-freespeech/ricochet-refresh.git`, or download source packages [on github](https://github.com/blueprint-freespeech/ricochet-refresh/releases). Then proceed to instructions for your platform.
+
+If you're interested in helping to package Ricochet Refresh for common Linux platforms, please get in touch!
+
+## Debug vs Release build
+
+Add `CONFIG+=debug` or `CONFIG+=release` to the qmake command for a debug or release build. Debug builds enable logging to standard output, and shouldn't be used in sensitive environments.
 
 ## Linux
 
@@ -39,6 +68,7 @@ If the `qml-module-qtquick` packages aren't available, try `qtdeclarative5-contr
 #### Qt SDK
 The [Qt SDK](https://www.qt.io/download/) is available for most Linux systems and includes an IDE as well as all Qt dependencies.
 
+### Building and Installing
 To build, simply run:
 ```sh
 qmake # qmake-qt5 for some platforms
@@ -47,19 +77,17 @@ make
 
 For a system-wide installation, use:
 ```sh
-qmake DEFINES+=RICOCHET_NO_PORTABLE
-make
 make install # as root
 ```
 
-You must have a `tor` binary installed on the system (in $PATH), or placed next to the `ricochet` binary.
+You must have a `tor` binary installed on the system (in `$PATH`), or placed next to the `ricochet-refresh` binary.
 
-In portable mode (default), all configuration is stored in a folder called `config` with the binary. When installed, the platform's user configuration path is used instead.
+By default Ricochet Refresh will load and save configuration files to `~/.local/share/ricochet-refresh/`. First argument to command-line overrides this and allows you to specificy the config directory.
 
-The [buildscripts](https://github.com/ricochet-im/buildscripts) repository contains a set of scripts to build a fully static Ricochet on a clean Debian system. These are used to create the generic linux binary packages.
+The [buildscripts](https://github.com/blueprint-freespeech/ricochet-refresh/tree/master/buildscripts) directory contains a set of scripts to build a fully static Ricochet Refresh on a clean Debian system. These are used to create the generic linux binary packages.
 
 #### Hardening
-Ricochet will use aggressive compiler hardening flags if available. `qmake` will print the results of these tests on first run, or when run with `CONFIG+=recheck`.
+Ricochet Refresh will use aggressive compiler hardening flags if available. `qmake` will print the results of these tests on first run, or when run with `CONFIG+=recheck`.
 
 To take full advantage of the sanitizer options, you may need to install `libasan` and `libubsan`.
 
@@ -77,9 +105,9 @@ You can either load `ricochet.pro` in Qt Creator and build normally, or build co
 make
 ```
 
-You also need a `tor` binary in $PATH or inside the build's `ricochet.app/Contents/MacOS` folder. The easiest solution is to use `brew install tor`. If you copy the `tor` binary, you will need to keep it up to date.
+You also need a `tor` binary in $PATH or inside the build's `ricochet refresh.app/Contents/MacOS` folder. The easiest solution is to use `brew install tor`. If you copy the `tor` binary, you will need to keep it up to date.
 
-Normally, configuration will be stored in a `config.ricochet` folder, in the same location as `ricochet.app`. However, if the bundle is installed to `/Applications`, the system location `~/Library/Application Support/Ricochet` is used instead. You can force that behavior by adding `DEFINES+=RICOCHET_NO_PORTABLE` to the qmake command.
+By default, configuration will be stored at `~/Library/Application Support/ricochet-refresh/` folder. This can be overriden by supplying a directory as first argument to the command-line.
 
 The `packaging/osx/release_osx.sh` script demonstrates how to build a redistributable app bundle.
 
@@ -94,7 +122,7 @@ make
 
 ## Windows
 
-Building for Windows is difficult. The process and scripts used for release builds are documented in the [buildscripts repository](https://github.com/ricochet-im/buildscripts/tree/master/mingw).
+Building for Windows is difficult. The process and scripts used for release builds are documented in the [buildscripts directory](https://github.com/blueprint-freespeech/ricochet-refresh/tree/master/buildscripts).
 
 For development builds, you will want:
  * Visual Studio C++ or MinGW