Merge branch 'release-0.5.0'

naxuroqa · Nov 12, 2018 · eb931f5 · eb931f5
2 parents 688ee75 + 69debf5
commit eb931f5
Show file tree

Hide file tree

Showing 120 changed files with 5,490 additions and 2,470 deletions.
diff --git a/.github/banner/venom.svg b/.github/banner/venom.svg
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN \
     libopus-dev \
     libsodium-dev \
     libsoup2.4-dev \
-    libsqlite3-dev \
+    libsqlcipher-dev \
     libvpx-dev \
     libgee-0.8-dev \
     libgspell-1-dev \

diff --git a/README.md b/README.md
@@ -1,13 +1,20 @@
-Venom
+![Venom](.github/banner/venom.svg)
 =====
 
-[![Build Status](https://travis-ci.org/naxuroqa/Venom.png?branch=develop)](https://travis-ci.org/naxuroqa/Venom) [![tip for next commit](http://tip4commit.com/projects/634.svg)](http://tip4commit.com/projects/634) [![codecov](https://codecov.io/gh/naxuroqa/Venom/branch/develop/graph/badge.svg)](https://codecov.io/gh/naxuroqa/Venom)
+[![Build Status](https://travis-ci.org/naxuroqa/Venom.png?branch=develop)](https://travis-ci.org/naxuroqa/Venom)
+![GitHub](https://img.shields.io/github/license/naxuroqa/venom.svg)
+![GitHub release](https://img.shields.io/github/release/naxuroqa/venom.svg)
+![GitHub last commit](https://img.shields.io/github/last-commit/naxuroqa/venom.svg)
+[![tip for next commit](http://tip4commit.com/projects/634.svg)](http://tip4commit.com/projects/634)
+[![codecov](https://codecov.io/gh/naxuroqa/Venom/branch/develop/graph/badge.svg)](https://codecov.io/gh/naxuroqa/Venom)
+
 
 ###### a modern [Tox](https://github.com/TokTok/c-toxcore) client for the GNU/Linux desktop
 
 Features
 --------
 
+* Encrypted profiles
 * Secure, private messaging
 * Read receipts
 * Contact aliases
@@ -19,6 +26,7 @@ Features
 * Socks5 Proxy support
 * Spell checking
 * Sound notifications
+* [Faux offline messaging](https://wiki.tox.chat/users/offline_messaging)
 
 Roadmap
 -------
@@ -41,7 +49,7 @@ Dependencies
 * `libgee >= 0.20`
 * `libsoup-2.4`
 * `gspell >= 1.8`
-* `sqlite3`
+* `sqlcipher`
 * `toxcore >= 0.2`
 
 Build-Dependencies

diff --git a/com.github.naxuroqa.venom.yml b/com.github.naxuroqa.venom.yml
@@ -15,20 +15,31 @@ finish-args:
   - --talk-name=org.freedesktop.Notifications
   - --filesystem=xdg-data/pixmaps/faces:ro
   - --filesystem=xdg-download
+cleanup-commands:
+  - rm -rf /app/bin/{DHT_bootstrap,gspell-app1,enchant*}
+  - rm -rf /app/include
+  - rm -rf /app/lib/{*.a,*.la,girepository-1.0,pkgconfig}
+  - rm -rf /app/lib/enchant-2/{*.a,*.la}
+  - rm -rf /app/share/{vala,man,gir-1.0}
 build-options:
-  cflags: -O3
+  cflags: -O3 -DSQLITE_HAS_CODEC
   cxxflags: -O3
 modules:
-  - name: libgee
-    build-options:
-      env:
-        PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR: /app/share/gir-1.0
-        PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR: /app/lib/girepository-1.0
+  - name: sqlcipher
+    rm-configure: true
+    config-opts:
+      - --enable-tempstore=yes
+      - --disable-tcl
     sources:
       - type: git
-        url: https://gitlab.gnome.org/GNOME/libgee
-        tag: 0.20.1
-        commit: 57e4c8a08d61ab77bbec310a3a1621e6bf3111cb
+        url: https://github.com/sqlcipher/sqlcipher
+        tag: v3.4.2
+        commit: c6f709fca81c910ba133aaf6330c28e01ccfe5f8
+        disable-fsckobjects: true
+      - type: script
+        dest-filename: autogen.sh
+        commands:
+          - AUTOMAKE="automake --foreign" autoreconf -vfi
   - name: libsodium
     sources:
       - type: git
@@ -45,6 +56,16 @@ modules:
         url: https://github.com/toktok/c-toxcore
         tag: v0.2.8
         commit: 3f35a84968f100e1e6d3c9df467fd3c82a9ebb13
+  - name: libgee
+    build-options:
+      env:
+        PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR: /app/share/gir-1.0
+        PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR: /app/lib/girepository-1.0
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/libgee
+        tag: 0.20.1
+        commit: 57e4c8a08d61ab77bbec310a3a1621e6bf3111cb
   - name: enchant
     sources:
       - type: archive

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('venom', ['vala', 'c'],
 			license: 'GPL3+',
-			version: '0.4.2'
+			version: '0.5.0'
 )
 
 i18n = import('i18n')

diff --git a/po/LINGUAS b/po/LINGUAS
@@ -4,6 +4,6 @@ fr
 it
 pl
 pt
-pt_br
+pt_BR
 ru
 zh_CN
diff --git a/po/POTFILES b/po/POTFILES
@@ -3,18 +3,19 @@ src/undo/UndoCommand.vala
 src/undo/UndoStack.vala
 src/undo/TextBufferUndoBinding.vala
 src/undo/SimpleUndoStack.vala
-src/core/Interfaces.vala
 src/core/NotificationListener.vala
 src/core/UserInfo.vala
 src/core/TimeStamp.vala
 src/core/FileTransfer.vala
 src/core/R.vala
 src/core/Logger.vala
 src/core/Message.vala
+src/core/GlobalSettings.vala
 src/core/Contact.vala
 src/core/FileIO.vala
 src/core/WidgetFactory.vala
 src/core/Tools.vala
+src/core/Profile.vala
 src/core/WindowState.vala
 src/core/Application.vala
 src/core/Identicon.vala
@@ -29,28 +30,32 @@ src/viewmodel/MessageViewModel.vala
 src/viewmodel/FileTransferEntryViewModel.vala
 src/viewmodel/CreateGroupchatViewModel.vala
 src/viewmodel/ConferenceInfoViewModel.vala
-src/tox/ToxSessionIO.vala
-src/tox/DhtNodeDatabase.vala
+src/tox/ToxMessage.vala
 src/tox/ToxAdapterFriendListener.vala
-src/tox/ContactDatabase.vala
+src/tox/JsonWebDhtNodeUpdater.vala
 src/tox/ToxAdapterFiletransferListener.vala
+src/tox/SqliteNospamRepository.vala
 src/tox/Conference.vala
 src/tox/FriendRequest.vala
 src/tox/ToxSessionThread.vala
+src/tox/SqliteDhtNodeRepository.vala
+src/tox/SqliteFriendRequestRepository.vala
 src/tox/ToxContact.vala
 src/tox/ToxSession.vala
-src/tox/JsonWebDhtNodeDatabase.vala
 src/tox/DhtNode.vala
-src/tox/SqliteDhtNodeDatabase.vala
+src/tox/SqliteContactRepository.vala
 src/tox/ToxAdapterSelfListener.vala
 src/tox/ToxAdapterConferenceListener.vala
-src/tox/MessageDatabase.vala
+src/tox/SqliteMessageRepository.vala
 src/tox/ConferenceMessage.vala
+src/tox/StaticDhtNodeUpdater.vala
 src/plugin/Plugin.vala
 src/plugin/Pluginregistrar.vala
 src/view/MessageWidget.vala
 src/view/ConferenceInfoWidget.vala
 src/view/ApplicationWindow.vala
+src/view/LoginWidget.vala
+src/view/InAppNotification.vala
 src/view/ConferenceWindow.vala
 src/view/NodeWidget.vala
 src/view/AboutDialog.vala
@@ -68,11 +73,13 @@ src/view/AddContactWidget.vala
 src/view/ConversationWindow.vala
 src/view/PeerEntry.vala
 src/view/FileTransferEntry.vala
+src/view/NospamEntry.vala
 src/view/ConferenceInviteEntry.vala
 src/view/UserInfoWidget.vala
 src/view/FriendInfoWidget.vala
 src/view/ContextStyleBinding.vala
 src/ui/file_transfer_widget.ui
+src/ui/login_widget.ui
 src/ui/contact_list_entry_compact.ui
 src/ui/application_window.ui
 src/ui/file_transfer_entry.ui
@@ -95,6 +102,7 @@ src/ui/user_info_widget.ui
 src/ui/contact_list_entry.ui
 src/ui/file_transfer_entry_inline.ui
 src/ui/settings_widget.ui
+src/ui/nospam_entry.ui
 src/ui/friend_info_widget.ui
 src/ui/error_widget.ui
 src/db/DatabaseInterfaces.vala
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,6 @@ fr @@
     it
     pl
     pt
-    pt_br
+    pt_BR
     ru
     zh_CN