From 6b7d328f874d773ed4058d4069c6633947979dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Bruy=C3=A8re?= Date: Wed, 8 Apr 2020 02:58:19 +0200 Subject: [PATCH] fix(react-internal): update the internal field used to retrieve the React instance (which caused app crash) fix(build): add a test certificate to easily create a test package --- .../JavaScript/helpers/react-internal.js | 4 ++-- Messenger UWP/Messenger UWP.csproj | 9 +++++---- Messenger UWP/Messenger UWP_TemporaryKey.pfx | Bin 0 -> 2568 bytes Messenger UWP/Package.appxmanifest | 4 ++-- Messenger UWP/Properties/AssemblyInfo.cs | 4 ++-- README.md | 4 +++- 6 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 Messenger UWP/Messenger UWP_TemporaryKey.pfx diff --git a/Messenger UWP/JavaScript/helpers/react-internal.js b/Messenger UWP/JavaScript/helpers/react-internal.js index af79dc4..e930af9 100644 --- a/Messenger UWP/JavaScript/helpers/react-internal.js +++ b/Messenger UWP/JavaScript/helpers/react-internal.js @@ -1,5 +1,5 @@ // This file is part of Messenger UWP. -// Copyright (C) 2019 Sylvain Bruyère +// Copyright (C) 2019-2020 Sylvain Bruyère // // Messenger UWP is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ var ReactInternal = (function () { var keys = Object.keys(domNode); for (var keyIndex in keys) { var key = keys[keyIndex]; - if (key.startsWith("__reactInternalInstance$")) { + if (key.startsWith("__reactFiber$") || key.startsWith("__reactInternalInstance$")) { return domNode[key]; } } diff --git a/Messenger UWP/Messenger UWP.csproj b/Messenger UWP/Messenger UWP.csproj index 449f964..3813955 100644 --- a/Messenger UWP/Messenger UWP.csproj +++ b/Messenger UWP/Messenger UWP.csproj @@ -11,7 +11,7 @@ Messenger UWP en-US UAP - 10.0.17763.0 + 10.0.18362.0 10.0.14393.0 10.0.16299.0 14 @@ -24,11 +24,12 @@ x86|x64|arm|arm64 0 OnApplicationRun - Auto + Never True True 0 - 1C9927E5ABB02C8F8DBFCB1CE1B18F6B4D4F001D + 13911CFE64EE28278849D6070A76B921F9D46FE2 + Messenger UWP_TemporaryKey.pfx SHA256 @@ -144,7 +145,7 @@ MainPage.xaml - + diff --git a/Messenger UWP/Messenger UWP_TemporaryKey.pfx b/Messenger UWP/Messenger UWP_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..86a90ec90817864b5d428a656b498cf592ebe6a5 GIT binary patch literal 2568 zcmZXWcU05K7RP@Hp#+c?I-yD3&=LtgweTdK8{>p_FC@#*ka?Ymg$@)@YqJR{RKk zZy|5Ms!>mB53ct#ORGi3u#)Yz)e3B8+i%Szb6fsun3Ybyvfd^sGNQenN1-zgR=U5y zvx_#iGdSIS&fP~?DWG_(J7YFpWLb71xnFDRxVl-9E1XOVtyPJAoLcLlrm)kFZ&IxI zRlLWs`!7!G5E99jNnf-~%YOIVsv3tjVcLHdyYZROlFn>?XPX5X!v^hmSZ5JFbm%{7 zG$bdoP13gH5cV%q8R>57I0B`&yf_Uq$0}Uyzkr|>WcA+KqcF->#StR^%7%0pw;Pa} zT%ePirCq5{MFaTXWia2EQm)Xu;e2v)z`0gt!~PS^k`3n_7-W5S%55GhA~m+hFPS0B zE&vaYc_pb+R}$`M9X}BuKhehT)HTBIvDc?~@lEERX97$^2;Bq*I(Z$hVSFs%yY75- zDvug`1kNniMYfenNs867xK}m_*ToQ z%Z)9+gwjmEaQP4Ohd?#K~o{KuKWgh9yl6`$I|oojcjV zQ(Um)L9w+%jJok(-ClJPZ?TEapl*0O_FUu{&Q`Lbd3yMcZ?0NW2%(!nGxE2Wn?MtH z8=p^%?3C(A6Kw;-nL^sE#p$e34__!P4d3kD)WKPx9Huebm~wF@(x3VYbYOgO^VX*U^Ts@#yUQ2){Vo`j9zQ%`fTR5oo zRLx=iP>jeF*~A8!hOO!QwZv;0$CVc=l~Yc?Ge)F;uR%ZkifidRztW~%@288C!|yP- z^WK=jw{f}WXo^17;giYJmR+oS45iKcQ+y9X9vj;+?bct4RxUE&_@`>X_HVc6deQt0ssJM_b=o`nFtvJXy5{X0+4_b-~o67UVt1m_MlP~YJ>(9 zsZ5a?c>wNIuko4`OkL5QBpxk@B5_REVxD3|^cJfVEVl#4-Uif3Pm{m_>4>;2~iv7%w zh!}8;3@9GcAe5RS{XGY_a;jq_MzxJLR5gibq_+!law5zDe1d&Vo&&{#`-}6TuFbRY z(EMnJ?=@9n2W{R2a@EYzx8g^}A11ZGNwP0(EELVC4-Majkny>@v0l~i-hKo?b~2y2 z<0W`GQ^{#4-KJb?Ys#%raOG@kYqFN95hi9JP#`YDEb1SxSxMR9yD#=)?tajBeW1g( z2J?0H^hIllha#A{YC)8J&32zDF=o9YI7g?+7U5tqd?;4YNG#A_2tWX^+jSnPVz^GaFX?a&$ z3*K+dAP1zkuakK!(kg|?Y9&Aqkc-H|3&uL zrW`w{1c700Vc{mEoR8F(+x?k^&WqJJ478J(P$X#LUVuoDTj>?L|5h%f>{4GuQ|O<7_kHlkXk+9DPV1eMvl?bckwd2Af@bD7#_tI#yc+vk`_^5ef=~q9@Q5!1c3T>4rh24y#s5U|_bFvgPZPb z=z$f0+2^fX(|ik`AvKV~NP0S285SBaKZG+#?l{4dHYb->n$pIEDzgi!S`mkEvg-vP cMR?mocCgCsBJl9}kq;qJECQ0b<{U6951J literal 0 HcmV?d00001 diff --git a/Messenger UWP/Package.appxmanifest b/Messenger UWP/Package.appxmanifest index 2edd2b4..857d9af 100644 --- a/Messenger UWP/Package.appxmanifest +++ b/Messenger UWP/Package.appxmanifest @@ -1,6 +1,6 @@  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - + diff --git a/Messenger UWP/Properties/AssemblyInfo.cs b/Messenger UWP/Properties/AssemblyInfo.cs index eb25b2d..9555fb7 100644 --- a/Messenger UWP/Properties/AssemblyInfo.cs +++ b/Messenger UWP/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.2.1.0")] +[assembly: AssemblyFileVersion("0.2.1.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/README.md b/README.md index c1eeffd..5827783 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](/COPYING) [![Build Status](https://dev.azure.com/ssoft-org/MessengerUWP/_apis/build/status/Messenger%20UWP%20CI?branchName=develop)](https://dev.azure.com/ssoft-org/MessengerUWP/_build/latest?branchName=develop) +![PRs: welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg) Messenger UWP is a Universal Windows Platform app that lets you access **Facebook Messenger on Windows 10 PCs, tablets and phones**. @@ -77,6 +78,7 @@ For developers: ## Changelog +- Version 0.2.1: Fix an issue where the app crashed due to [an internal change in React](https://github.com/facebook/react/pull/18377). - Version 0.2.0: - Improve dialogs, settings and chatbot cards for small screens. - Improve navigation between the master and detail view: navigation should work in all cases. @@ -86,6 +88,6 @@ For developers: ## License -Copyright (C) 2019 Sylvain Bruyère +Copyright (C) 2019-2020 Sylvain Bruyère This repository is licensed with the [GNU General Public License v3.0 only (GPL-3.0-only)](/COPYING). \ No newline at end of file