spixi-0.6.12

- updated to latest IxiCore - updated NuGet
ProjectIxian · Dec 31, 2022 · df9840c · df9840c
1 parent 6c761aa
commit df9840c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/SPIXI/SPIXI.Android/Properties/AndroidManifest.xml b/SPIXI/SPIXI.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.11" package="io.ixian.spixi" android:installLocation="auto" android:versionCode="0160000692">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="30" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.12" package="io.ixian.spixi" android:installLocation="auto" android:versionCode="0160000693">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -14,7 +14,7 @@
 	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
 	<uses-feature android:name="android.hardware.audio.low_latency" android:required="false" />
 	<uses-feature android:name="android.hardware.audio.pro" android:required="false" />
-	<application android:label="Spixi" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_round_launcher">
+	<application android:label="Spixi" android:icon="@mipmap/ic_launcher">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.ixian.provider" android:exported="false" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths" />
 		</provider>

diff --git a/SPIXI/SPIXI.Android/Resources/Resource.designer.cs b/SPIXI/SPIXI.Android/Resources/Resource.designer.cs
diff --git a/SPIXI/SPIXI.WPF/SPIXI.WPF.csproj b/SPIXI/SPIXI.WPF/SPIXI.WPF.csproj
@@ -124,7 +124,7 @@
       <HintPath>..\..\packages\NAudio.WinMM.2.0.1\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK, Version=3.3.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OpenTK.3.3.1\lib\net20\OpenTK.dll</HintPath>

diff --git a/SPIXI/SPIXI.WPF/packages.config b/SPIXI/SPIXI.WPF/packages.config
@@ -16,7 +16,7 @@
   <package id="NAudio.WinForms" version="2.0.1" targetFramework="net48" />
   <package id="NAudio.WinMM" version="2.0.1" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
   <package id="OpenTK" version="3.3.1" targetFramework="net48" />
   <package id="OpenTK.GLControl" version="3.1.0" targetFramework="net48" />
   <package id="Portable.BouncyCastle" version="1.8.10" targetFramework="net48" />

diff --git a/SPIXI/SPIXI.iOS/Info.plist b/SPIXI/SPIXI.iOS/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>io.ixian.spixi</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.11</string>
+	<string>0.6.12</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>
@@ -54,6 +54,6 @@
 	<key>XSAppIconAssets</key>
 	<string>Media.xcassets/AppIcons.appiconset</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.11</string>
+	<string>0.6.12</string>
 </dict>
 </plist>
diff --git a/SPIXI/SPIXI/Meta/Config.cs b/SPIXI/SPIXI/Meta/Config.cs
@@ -28,7 +28,7 @@ public class Config
         public static readonly int packetDataSize = 102400; // 100 Kb per packet for file transfers
         public static readonly long packetRequestTimeout = 60; // Time in seconds to re-request packets
 
-        public static readonly string version = "spixi-0.6.11"; // Spixi version
+        public static readonly string version = "spixi-0.6.12"; // Spixi version
 
         public static readonly string checkVersionUrl = "https://www.ixian.io/spixi-update.txt";
         public static readonly int checkVersionSeconds = 1 * 60 * 60; // 1 hour

diff --git a/SPIXI/SPIXI/Meta/Node.cs b/SPIXI/SPIXI/Meta/Node.cs
@@ -414,7 +414,7 @@ public override int getLastBlockVersion()
         public override bool addTransaction(Transaction tx, bool force_broadcast)
         {
             // TODO Send to peer if directly connectable
-            CoreProtocolMessage.broadcastProtocolMessage(new char[] { 'M', 'H' }, ProtocolMessageCode.transactionData, tx.getBytes(), null);
+            CoreProtocolMessage.broadcastProtocolMessage(new char[] { 'M', 'H' }, ProtocolMessageCode.transactionData2, tx.getBytes(true, true), null);
             PendingTransactions.addPendingLocalTransaction(tx);
             return true;
         }
@@ -479,7 +479,7 @@ public static void processPendingTransactions()
 
                     if (cur_time - tx_time > 40) // if the transaction is pending for over 40 seconds, resend
                     {
-                        CoreProtocolMessage.broadcastProtocolMessage(new char[] { 'M', 'H' }, ProtocolMessageCode.transactionData, t.getBytes(), null);
+                        CoreProtocolMessage.broadcastProtocolMessage(new char[] { 'M', 'H' }, ProtocolMessageCode.transactionData2, t.getBytes(true, true), null);
                         entry.addedTimestamp = cur_time;
                         entry.confirmedNodeList.Clear();
                     }

diff --git a/SPIXI/SPIXI/SPIXI.csproj b/SPIXI/SPIXI/SPIXI.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Concentus" Version="1.1.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Open.NAT.Core" Version="2.1.0.5" />
     <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />