Skip to content

Commit

Permalink
- added support for latest Ixian-Core
Browse files Browse the repository at this point in the history
- updated fonts
- updated Spixi-PushService project configuration
  • Loading branch information
firestorm40 committed Nov 21, 2024
1 parent ebe5628 commit f4c9dfd
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 100 deletions.
4 changes: 4 additions & 0 deletions Spixi-PushService/Spixi-PushService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<ProvisioningType>manual</ProvisioningType>
</PropertyGroup>

<PropertyGroup Condition="!$(TargetFramework.Contains('-ios'))">
<BuildProject>false</BuildProject>
</PropertyGroup>

<!-- strip exited with code 139 workaround - https://github.com/xamarin/xamarin-macios/issues/19157 -->
<PropertyGroup>
<MtouchNoSymbolStrip Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">True</MtouchNoSymbolStrip>
Expand Down
47 changes: 0 additions & 47 deletions Spixi/Network/NetworkProtocol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,37 +192,6 @@ public static void parseProtocolMessage(ProtocolMessageCode code, byte[] data, R
}
break;

case ProtocolMessageCode.getPresence:
{
using (MemoryStream m = new MemoryStream(data))
{
using (BinaryReader reader = new BinaryReader(m))
{
int walletLen = reader.ReadInt32();
Address wallet = new Address(reader.ReadBytes(walletLen));

Presence p = PresenceList.getPresenceByAddress(wallet);
if (p != null)
{
lock (p)
{
byte[][] presence_chunks = p.getByteChunks();
foreach (byte[] presence_chunk in presence_chunks)
{
endpoint.sendData(ProtocolMessageCode.updatePresence, presence_chunk, null);
}
}
}
else
{
// TODO blacklisting point
Logging.warn(string.Format("Node has requested presence information about {0} that is not in our PL.", wallet.ToString()));
}
}
}
}
break;

case ProtocolMessageCode.getPresence2:
{
using (MemoryStream m = new MemoryStream(data))
Expand Down Expand Up @@ -288,22 +257,6 @@ public static void parseProtocolMessage(ProtocolMessageCode code, byte[] data, R
}
break;

case ProtocolMessageCode.transactionData:
{
// TODO: check for errors/exceptions
Transaction transaction = new Transaction(data, true);

if (endpoint.presenceAddress.type == 'M' || endpoint.presenceAddress.type == 'H')
{
PendingTransactions.increaseReceivedCount(transaction.id, endpoint.presence.wallet);
}

TransactionCache.addUnconfirmedTransaction(transaction);

Node.tiv.receivedNewTransaction(transaction);
}
break;

case ProtocolMessageCode.transactionData2:
{
// TODO: check for errors/exceptions
Expand Down
1 change: 0 additions & 1 deletion Spixi/Resources/Raw/html/css/empty-spixiui-dark.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
body {
margin: 0;
padding: 0;
font-family: 'Roboto', sans-serif;
text-align: center;
background-color: #17181C;
display: flex;
Expand Down
1 change: 0 additions & 1 deletion Spixi/Resources/Raw/html/css/empty-spixiui-light.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
body {
margin: 0;
padding: 0;
font-family: 'Roboto', sans-serif;
text-align: center;
background-color: #EEF2F5;
display: flex;
Expand Down
18 changes: 1 addition & 17 deletions Spixi/Resources/Raw/html/css/spixiui-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/*
* Content Sections:
*
* Fonts
* General
* Placeholders
* Toolbar
Expand All @@ -32,24 +31,9 @@
* Animation
*/

/* Fonts */
@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}


/* General */
body, html, * {
font-family: 'roboto', sans-serif;

}

a:hover {
Expand Down
17 changes: 0 additions & 17 deletions Spixi/Resources/Raw/html/css/spixiui-intro.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,8 @@
* https://ixian.io | https://spixi.io
*/

/* Fonts */
@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}


/* General */
body, html, * {
font-family: 'roboto', sans-serif;
box-sizing: border-box;
}

Expand Down
18 changes: 1 addition & 17 deletions Spixi/Resources/Raw/html/css/spixiui-light.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/*
* Content Sections:
*
* Fonts
* General
* Placeholders
* Toolbar
Expand All @@ -32,24 +31,9 @@
* Animation
*/

/* Fonts */
@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'roboto';
src: url('../fonts/Roboto-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}


/* General */
body, html, * {
font-family: 'roboto', sans-serif;

}

a:hover {
Expand Down

0 comments on commit f4c9dfd

Please sign in to comment.