averello/kdeconnect-ios-mirror
1
0
Fork 0
mirror of https://invent.kde.org/network/kdeconnect-ios.git synced 2025-12-12 20:36:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate id field

Browse Source
This commit is contained in:
Albert Vaca Cintora
2025-02-23 17:50:14 +01:00
parent 61f8ea895d
commit 5de91dc7b1
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
KDE Connect/KDE Connect/ObjC Backend/NetworkPacket.h
View File

@@ -94,7 +94,6 @@ FOUNDATION_EXPORT NetworkPacketType const NetworkPacketTypeRunCommand;
@interface NetworkPacket : NSObject
@property(nonatomic) NSNumber *_Id;
@property(nonatomic) NetworkPacketType type;
@property(nonatomic) NSMutableDictionary<NSString *, id> *_Body;
@property(nonatomic, nullable) NSURL *payloadPath;

8
KDE Connect/KDE Connect/ObjC Backend/NetworkPacket.m
View File

@@ -47,14 +47,12 @@
{
if ((self=[super init]))
{
_Id=[NSNumber numberWithLong:[[NSDate date] timeIntervalSince1970]];
self.type=type;
_Body=[NSMutableDictionary dictionary];
}
return self;
}
@synthesize _Id;
@synthesize type;
@synthesize _Body;
@synthesize _PayloadSize;
@@ -156,7 +154,8 @@
- (NSData*) serialize
{
NSArray* keys=[NSArray arrayWithObjects:@"id",@"type",@"body", nil];
NSArray* values=[NSArray arrayWithObjects:[self _Id],self.type,[self _Body], nil];
NSNumber* _id = [NSNumber numberWithLong:[[NSDate date] timeIntervalSince1970]];
NSArray* values=[NSArray arrayWithObjects:_id, self.type, [self _Body], nil];
NSMutableDictionary* info=[NSMutableDictionary dictionaryWithObjects:values forKeys:keys];
if (_payloadPath) {
// TODO: is checking _PayloadSize == 0 then changing it to -1 necessary?
@@ -183,13 +182,12 @@
NSDictionary* info=[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&err];
// FIXME: add missing null check
[np set_Id:[info valueForKey:@"id"]];
np.type = [info valueForKey:@"type"];
[np set_Body:[info valueForKey:@"body"]];
[np set_PayloadSize:[[info valueForKey:@"payloadSize"]longValue]];
[np setPayloadTransferInfo:[info valueForKey:@"payloadTransferInfo"]];
// NSLog(@"Parsed id: %@, type: %@", [info valueForKey:@"id"], [info valueForKey:@"type"]);
// NSLog(@"Parsed type: %@", [info valueForKey:@"type"]);
//TO-DO should change for laptop
if ([np _PayloadSize]==-1) {