Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an app crash due to an internal change in React #3

Merged
merged 1 commit into from Apr 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions 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
Expand Down Expand Up @@ -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];
}
}
Expand Down
9 changes: 5 additions & 4 deletions Messenger UWP/Messenger UWP.csproj
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>Messenger UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == ''">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == ''">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion Condition="'$(Platform)' != 'ARM64'">10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion Condition="'$(Platform)' == 'ARM64'">10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
Expand All @@ -24,11 +24,12 @@
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
<AppxBundle>Auto</AppxBundle>
<AppxBundle>Never</AppxBundle>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<PackageCertificateThumbprint>1C9927E5ABB02C8F8DBFCB1CE1B18F6B4D4F001D</PackageCertificateThumbprint>
<PackageCertificateThumbprint>13911CFE64EE28278849D6070A76B921F9D46FE2</PackageCertificateThumbprint>
<PackageCertificateKeyFile>Messenger UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
Expand Down Expand Up @@ -144,7 +145,7 @@
<Compile Include="MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
<None Include="Package.StoreAssociation.xml" />
<None Include="Messenger UWP_TemporaryKey.pfx" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\AppIcon.scale-100.png" />
Expand Down
Binary file added Messenger UWP/Messenger UWP_TemporaryKey.pfx
Binary file not shown.
4 changes: 2 additions & 2 deletions Messenger UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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
Expand All @@ -20,7 +20,7 @@ along with Messenger UWP. If not, see <https://www.gnu.org/licenses/>. -->
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp">

<Identity Name="53330SSoft.MessengerUWP" Publisher="CN=C2230194-F9C4-4811-936E-C2BD4208FD18" Version="0.2.0.0" />
<Identity Name="53330SSoft.MessengerUWP" Publisher="CN=C2230194-F9C4-4811-936E-C2BD4208FD18" Version="0.2.1.0" />
<mp:PhoneIdentity PhoneProductId="59435353-1be9-48a9-aaba-cfb9634454a1" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

<Properties>
Expand Down
4 changes: 2 additions & 2 deletions Messenger UWP/Properties/AssemblyInfo.cs
Expand Up @@ -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)]
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -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**.

Expand Down Expand Up @@ -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.
Expand All @@ -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).