Merge pull request #1833 from Bilb/network-clear-all

Network clear all

.eslintignore

@@ -11,6 +11,9 @@ js/util_worker.js
 libtextsecure/components.js
 libtextsecure/test/test.js
 test/test.js
+libloki/test/components.js
+libloki/test/test.js
+
 
 # Third-party files
 js/Mp3LameEncoder.min.js

.gitignore

@@ -43,4 +43,6 @@ proxy.pub
 yarn-error.log
 
 # editor
-.vscode/
+.vscode/
+
+libloki/test/test.js

.husky/_/husky.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+    exit $exitCode
+  fi
+
+  exit 0
+fi

.prettierignore

@@ -12,6 +12,8 @@ libtextsecure/components.js
 libtextsecure/test/test.js
 stylesheets/*.css
 test/test.js
+libloki/test/test.js
+
 test/ts/**/*.js
 ts/**/*.js
 ts/protobuf/*.d.ts

_locales/en/messages.json

@@ -131,7 +131,7 @@
   "deleteForEveryone": "Delete for Everyone",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clearAllData": "Clear All Data",
-  "deleteAccountWarning": "This will permanently delete your messages, sessions, and contacts.",
+  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
@@ -419,5 +419,12 @@
   "latestUnreadIsAbove": "First unread message is above",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "notificationSubtitle": "Notifications - $setting$"
+  "notificationSubtitle": "Notifications - $setting$",
+  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
+  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Would you like to clear only this device, or delete your entire account?",
+  "deviceOnly": "Device Only",
+  "entireAccount": "Entire Account"
 }

background.html

@@ -63,8 +63,6 @@
     <script type="text/javascript" src="js/views/session_registration_view.js"></script>
     <script type="text/javascript" src="js/views/app_view.js"></script>
 
-    <script type="text/javascript" src="js/views/session_id_reset_view.js"></script>
-
     <!-- CRYPTO -->
     <script type="text/javascript" src="js/wall_clock_listener.js"></script>
   </head>

build/config.gypi

@@ -0,0 +1,83 @@
+# Do not edit. File was generated by node-gyp's "configure" step
+{
+  "target_defaults": {
+    "cflags": [],
+    "default_configuration": "Release",
+    "defines": [],
+    "include_dirs": [],
+    "libraries": []
+  },
+  "variables": {
+    "asan": 0,
+    "build_v8_with_gn": "false",
+    "coverage": "false",
+    "dcheck_always_on": 0,
+    "debug_nghttp2": "false",
+    "debug_node": "false",
+    "enable_lto": "false",
+    "enable_pgo_generate": "false",
+    "enable_pgo_use": "false",
+    "error_on_warn": "false",
+    "force_dynamic_crt": 0,
+    "gas_version": "2.30",
+    "host_arch": "x64",
+    "icu_data_in": "../../deps/icu-tmp/icudt67l.dat",
+    "icu_endianness": "l",
+    "icu_gyp_path": "tools/icu/icu-generic.gyp",
+    "icu_path": "deps/icu-small",
+    "icu_small": "false",
+    "icu_ver_major": "67",
+    "is_debug": 0,
+    "llvm_version": "0.0",
+    "napi_build_version": "7",
+    "node_byteorder": "little",
+    "node_debug_lib": "false",
+    "node_enable_d8": "false",
+    "node_install_npm": "true",
+    "node_module_version": 83,
+    "node_no_browser_globals": "false",
+    "node_prefix": "/",
+    "node_release_urlbase": "https://nodejs.org/download/release/",
+    "node_section_ordering_info": "",
+    "node_shared": "false",
+    "node_shared_brotli": "false",
+    "node_shared_cares": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
+    "node_shared_nghttp2": "false",
+    "node_shared_openssl": "false",
+    "node_shared_zlib": "false",
+    "node_tag": "",
+    "node_target_type": "executable",
+    "node_use_bundled_v8": "true",
+    "node_use_dtrace": "false",
+    "node_use_etw": "false",
+    "node_use_node_code_cache": "true",
+    "node_use_node_snapshot": "true",
+    "node_use_openssl": "true",
+    "node_use_v8_platform": "true",
+    "node_with_ltcg": "false",
+    "node_without_node_options": "false",
+    "openssl_fips": "",
+    "openssl_is_fips": "false",
+    "ossfuzz": "false",
+    "shlib_suffix": "so.83",
+    "target_arch": "x64",
+    "v8_enable_31bit_smis_on_64bit_arch": 0,
+    "v8_enable_gdbjit": 0,
+    "v8_enable_i18n_support": 1,
+    "v8_enable_inspector": 1,
+    "v8_enable_lite_mode": 0,
+    "v8_enable_object_print": 1,
+    "v8_enable_pointer_compression": 0,
+    "v8_no_strict_aliasing": 1,
+    "v8_optimized_debug": 1,
+    "v8_promise_internal_field_count": 1,
+    "v8_random_seed": 0,
+    "v8_trace_maps": 0,
+    "v8_use_siphash": 1,
+    "want_separate_host_toolset": 0,
+    "nodedir": "/home/warrick/.cache/node-gyp/14.16.0",
+    "standalone_static_library": 1
+  }
+}

js/background.js

@@ -348,7 +348,7 @@
     Whisper.Notifications.on('click', async (id, messageId) => {
       window.showWindow();
       if (id) {
-        await window.openConversationWithMessages({ id, messageId });
+        await window.openConversationWithMessages({ conversationKey: id, messageId });
       } else {
         appView.openInbox({
           initialLoadComplete,

js/modules/signal.js

@@ -12,7 +12,6 @@ const LinkPreviews = require('./link_previews');
 const { Message } = require('../../ts/components/conversation/Message');
 
 // Components
-const { SessionIDResetDialog } = require('../../ts/components/session/SessionIDResetDialog');
 const { SessionRegistrationView } = require('../../ts/components/session/SessionRegistrationView');
 
 const { SessionInboxView } = require('../../ts/components/session/SessionInboxView');
@@ -121,7 +120,6 @@ exports.setup = (options = {}) => {
 
   const Components = {
     SessionInboxView,
-    SessionIDResetDialog,
     SessionRegistrationView,
     Message,
   };

js/util_worker_tasks.js

@@ -13,6 +13,7 @@ const functions = {
   generateEphemeralKeyPair,
   decryptAttachmentBuffer,
   encryptAttachmentBuffer,
+  bytesFromString,
 };
 
 onmessage = async e => {