Skip to content

Commit 8a69727

Browse files
sanderpicksanderpick
authored
go-mobile@0.1.11 (#71)
* ios: go-mobile@0.1.10 updates * go-mobile: bump to 0.1.11 * android: go-mobile@0.1.10 updates * api: updates for go-mobile@0.1.11 * threads: adds snapshotTheads across all * version: remove rc * Textile: update pod to 0.1.0
1 parent accf0c1 commit 8a69727

17 files changed

+179
-79
lines changed

‎android/src/main/java/io/textile/rnmobile/TextileNode.java

+51-16
Original file line numberDiff line numberDiff line change
@@ -105,33 +105,33 @@ public void run() {
105105
}
106106

107107
@ReactMethod
108-
public void accountPeers(final Promise promise) {
108+
public void accountContact(final Promise promise) {
109109
executor.execute(new Runnable() {
110110
@Override
111111
public void run() {
112112
try {
113-
promise.resolve(encode(node.accountPeers()));
113+
promise.resolve(encode(node.accountContact()));
114114
}
115115
catch (Exception e) {
116-
promise.reject("accountPeers", e);
116+
promise.reject("accountContact", e);
117117
}
118118
}
119119
});
120120
}
121121

122122
@ReactMethod
123-
public void findThreadBackups(final String queryStr, final String optionsStr, final Promise promise) {
123+
public void syncAccount(final String optionsStr, final Promise promise) {
124124
executor.execute(new Runnable() {
125125
@Override
126126
public void run() {
127127
try {
128128
if (TextileNode.searchHandle != null) {
129129
TextileNode.searchHandle.cancel();
130130
}
131-
TextileNode.searchHandle = node.findThreadBackups(decode(queryStr), decode(optionsStr));
131+
TextileNode.searchHandle = node.syncAccount(decode(optionsStr));
132132
}
133133
catch (Exception e) {
134-
promise.reject("findThreadBackups", e);
134+
promise.reject("syncAccount", e);
135135
}
136136
}
137137
});
@@ -563,12 +563,13 @@ public void run() {
563563
// Invites ---------------->
564564

565565
@ReactMethod
566-
public void addInvite(final String threadId, final String inviteeId, final Promise promise) {
566+
public void addInvite(final String threadId, final String address, final Promise promise) {
567567
executor.execute(new Runnable() {
568568
@Override
569569
public void run() {
570570
try {
571-
promise.resolve(node.addInvite(threadId, inviteeId));
571+
node.addInvite(threadId, address);
572+
promise.resolve(null);
572573
}
573574
catch (Exception e) {
574575
promise.reject("addInvite", e);
@@ -825,31 +826,31 @@ public void run() {
825826
}
826827

827828
@ReactMethod
828-
public void username(final Promise promise) {
829+
public void name(final Promise promise) {
829830
executor.execute(new Runnable() {
830831
@Override
831832
public void run() {
832833
try {
833-
promise.resolve(node.username());
834+
promise.resolve(node.name());
834835
}
835836
catch (Exception e) {
836-
promise.reject("username", e);
837+
promise.reject("name", e);
837838
}
838839
}
839840
});
840841
}
841842

842843
@ReactMethod
843-
public void setUsername(final String username, final Promise promise) {
844+
public void setName(final String name, final Promise promise) {
844845
executor.execute(new Runnable() {
845846
@Override
846847
public void run() {
847848
try {
848-
node.setUsername(username);
849+
node.setName(name);
849850
promise.resolve(null);
850851
}
851852
catch (Exception e) {
852-
promise.reject("setUsername", e);
853+
promise.reject("setName", e);
853854
}
854855
}
855856
});
@@ -939,7 +940,7 @@ public void run() {
939940
}
940941

941942
@ReactMethod
942-
public void rename(final String threadId, final String name, final Promise promise) {
943+
public void renameThread(final String threadId, final String name, final Promise promise) {
943944
executor.execute(new Runnable() {
944945
@Override
945946
public void run() {
@@ -985,7 +986,7 @@ public void run() {
985986
}
986987

987988
@ReactMethod
988-
public void peers(final String threadId, final Promise promise) {
989+
public void threadPeers(final String threadId, final Promise promise) {
989990
executor.execute(new Runnable() {
990991
@Override
991992
public void run() {
@@ -1014,6 +1015,40 @@ public void run() {
10141015
});
10151016
}
10161017

1018+
@ReactMethod
1019+
public void snapshotThreads(final Promise promise) {
1020+
executor.execute(new Runnable() {
1021+
@Override
1022+
public void run() {
1023+
try {
1024+
node.snapshotThreads();
1025+
promise.resolve(null);
1026+
}
1027+
catch (Exception e) {
1028+
promise.reject("snapshotThreads", e);
1029+
}
1030+
}
1031+
});
1032+
}
1033+
1034+
@ReactMethod
1035+
public void searchThreadSnapshots(final String queryStr, final String optionsStr, final Promise promise) {
1036+
executor.execute(new Runnable() {
1037+
@Override
1038+
public void run() {
1039+
try {
1040+
if (TextileNode.searchHandle != null) {
1041+
TextileNode.searchHandle.cancel();
1042+
}
1043+
TextileNode.searchHandle = node.searchThreadSnapshots(decode(queryStr), decode(optionsStr));
1044+
}
1045+
catch (Exception e) {
1046+
promise.reject("searchThreadSnapshots", e);
1047+
}
1048+
}
1049+
});
1050+
}
1051+
10171052

10181053
// Mobile ---------------->
10191054

‎ios/RNTextile.xcworkspace/contents.xcworkspacedata

-9
This file was deleted.

‎ios/TextileNode.m

+32-16
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,21 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
110110
[self fulfillWithResult:[result base64EncodedStringWithOptions:0] nilDefault:@"" error:error resolver:resolve rejecter:reject];
111111
}
112112

113-
RCT_EXPORT_METHOD(accountPeers:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
113+
RCT_EXPORT_METHOD(accountContact:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
114114
NSError *error;
115-
NSData *result = [self.node accountPeers:&error];
115+
NSData *result = [self.node accountContact:&error];
116116
[self fulfillWithResult:[result base64EncodedStringWithOptions:0] nilDefault:@"" error:error resolver:resolve rejecter:reject];
117117
}
118118

119-
RCT_EXPORT_METHOD(findThreadBackups:(NSString*)queryStr options:(NSString*)optionsStr resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
119+
RCT_EXPORT_METHOD(syncAccount:(NSString*)optionsStr resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
120120
if (self.searchHandle) {
121121
[self.searchHandle cancel];
122122
self.searchHandle = nil;
123123
}
124124

125-
NSData *query = [[NSData alloc] initWithBase64EncodedString:queryStr options:0];
126125
NSData *options = [[NSData alloc] initWithBase64EncodedString:optionsStr options:0];
127126
NSError *error;
128-
self.searchHandle = [self.node findThreadBackups:query options:options error:&error];
127+
self.searchHandle = [self.node syncAccount:options error:&error];
129128
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
130129
}
131130

@@ -237,8 +236,6 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
237236

238237
RCT_EXPORT_METHOD(prepareFiles:(NSString*)strBase64 threadId:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
239238

240-
// NSData *fileData = [[NSData alloc] initWithBase64EncodedString:dataStr options:0];
241-
242239
[self.node prepareFiles:strBase64 threadId:threadId cb:[[TEXCallback alloc] initWithCompletion:^ (NSData *data, NSError *error) {
243240
if (error) {
244241
reject(@(error.code).stringValue, error.localizedDescription, error);
@@ -319,10 +316,10 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
319316

320317
#pragma mark - Invites ---------------->
321318

322-
RCT_EXPORT_METHOD(addInvite:(NSString*)threadId inviteeId:(NSString*)inviteeId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
319+
RCT_EXPORT_METHOD(addInvite:(NSString*)threadId inviteeId:(NSString*)address resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
323320
NSError *error;
324-
NSString *result = [self.node addInvite:threadId inviteeId:inviteeId error:&error];
325-
[self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
321+
[self.node addInvite:threadId address:address error:&error];
322+
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
326323
}
327324

328325
RCT_EXPORT_METHOD(addExternalInvite:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -429,14 +426,14 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
429426
[self fulfillWithResult:[result base64EncodedStringWithOptions:0] nilDefault:@"" error:error resolver:resolve rejecter:reject];
430427
}
431428

432-
RCT_EXPORT_METHOD(username:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
429+
RCT_EXPORT_METHOD(name:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
433430
NSError *error;
434-
[self fulfillWithResult:[self.node username:&error] error:error resolver:resolve rejecter:reject];
431+
[self fulfillWithResult:[self.node name:&error] error:error resolver:resolve rejecter:reject];
435432
}
436433

437-
RCT_EXPORT_METHOD(setUsername:(NSString*)username resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
434+
RCT_EXPORT_METHOD(setName:(NSString*)name resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
438435
NSError *error;
439-
[self.node setUsername:username error:&error];
436+
[self.node setName:name error:&error];
440437
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
441438
}
442439

@@ -477,7 +474,7 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
477474
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
478475
}
479476

480-
RCT_EXPORT_METHOD(rename:(NSString*)threadId name:(NSString*)name resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
477+
RCT_EXPORT_METHOD(renameThread:(NSString*)threadId name:(NSString*)name resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
481478
NSError *error;
482479
[self.node renameThread:threadId name:name error:&error];
483480
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
@@ -495,7 +492,7 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
495492
[self fulfillWithResult:[result base64EncodedStringWithOptions:0] nilDefault:@"" error:error resolver:resolve rejecter:reject];
496493
}
497494

498-
RCT_EXPORT_METHOD(peers:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
495+
RCT_EXPORT_METHOD(threadPeers:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
499496
NSError *error;
500497
NSData *result = [self.node threadPeers:threadId error:&error];
501498
[self fulfillWithResult:[result base64EncodedStringWithOptions:0] nilDefault:@"" error:error resolver:resolve rejecter:reject];
@@ -506,6 +503,25 @@ - (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseR
506503
[self fulfillWithResult:[self.node removeThread:id_ error:&error] error:error resolver:resolve rejecter:reject];
507504
}
508505

506+
RCT_EXPORT_METHOD(snapshotThreads:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
507+
NSError *error;
508+
[self.node snapshotThreads:&error];
509+
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
510+
}
511+
512+
RCT_EXPORT_METHOD(searchThreadSnapshots:(NSString*)queryStr options:(NSString*)optionsStr resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
513+
if (self.searchHandle) {
514+
[self.searchHandle cancel];
515+
self.searchHandle = nil;
516+
}
517+
518+
NSData *query = [[NSData alloc] initWithBase64EncodedString:queryStr options:0];
519+
NSData *options = [[NSData alloc] initWithBase64EncodedString:optionsStr options:0];
520+
NSError *error;
521+
self.searchHandle = [self.node searchThreadSnapshots:query options:options error:&error];
522+
[self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
523+
}
524+
509525

510526
#pragma mark - Mobile ---------------->
511527

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@textile/react-native-sdk",
3-
"version": "1.1.0-rc47",
3+
"version": "1.1.0",
44
"description": "## Getting started",
55
"nativePackage": true,
66
"main": "dist/index.js",
@@ -69,7 +69,7 @@
6969
"typescript": "^3.1.1"
7070
},
7171
"dependencies": {
72-
"@textile/go-mobile": "0.1.10-rc4",
72+
"@textile/go-mobile": "0.1.11",
7373
"buffer": "^5.2.1"
7474
},
7575
"directories": {

‎src/Textile/API/account.ts

+14-12
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export async function seed(): Promise<string> {
2929
}
3030

3131
/**
32-
* Encrypt any file with the account address.
32+
* Encrypt data with the account address.
3333
*
3434
* ```typescript
3535
* const encrypted = API.account.encrypt(Buffer.from(JSON.stringify({foo:"bar"})));
@@ -41,7 +41,7 @@ export async function encrypt(input: Buffer): Promise<Buffer> {
4141
}
4242

4343
/**
44-
* Decrypt a file previously encrypted with the account address.
44+
* Decrypt data previously encrypted with the account address.
4545
*
4646
* ```typescript
4747
* const decrypted = API.account.decrypt(encrypted);
@@ -53,27 +53,29 @@ export async function decrypt(input: Buffer): Promise<Buffer> {
5353
}
5454

5555
/**
56-
* List all Contacts.
56+
* List all own contact.
5757
*
5858
* ```typescript
59-
* const contacts: pb.IContactList = API.account.peers();
59+
* const contact: pb.IContact = API.account.contact();
6060
* ```
6161
*/
62-
export async function peers(): Promise<pb.IContactList> {
63-
const result = await TextileNode.accountPeers()
64-
return pb.ContactList.decode(Buffer.from(result, 'base64'))
62+
export async function contact(): Promise<pb.IContact | undefined> {
63+
const result = await TextileNode.accountContact()
64+
if (!result) {
65+
return undefined
66+
}
67+
return pb.Contact.decode(Buffer.from(result, 'base64'))
6568
}
6669

6770
/**
68-
* Locate all Thread backups.
71+
* Search and apply account thread snapshots.
6972
* ```typescript
70-
* const backups = API.account.findThreadBackups(query, options);
73+
* API.account.sync(options);
7174
* ```
7275
* @hidden
7376
*/
74-
export async function findThreadBackups(query: pb.IThreadBackupQuery, options: pb.IQueryOptions): Promise<string> {
75-
return TextileNode.findThreadBackups(
76-
Buffer.from(pb.ThreadBackupQuery.encode(query).finish()).toString('base64'),
77+
export async function sync(options: pb.IQueryOptions): Promise<string> {
78+
return TextileNode.syncAccount(
7779
Buffer.from(pb.QueryOptions.encode(options).finish()).toString('base64'),
7880
)
7981
}

‎src/Textile/API/cafes.ts

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export async function session(peerId: string): Promise<pb.ICafeSession | undefin
2727
}
2828
return pb.CafeSession.decode(Buffer.from(result, 'base64'))
2929
}
30+
3031
/**
3132
* List all sessions.
3233
* ```typescript
@@ -40,6 +41,7 @@ export async function sessions(): Promise<pb.ICafeSessionList | undefined> {
4041
}
4142
return pb.CafeSessionList.decode(Buffer.from(result, 'base64'))
4243
}
44+
4345
/**
4446
* Refresh an existing session by peerId.
4547
* ```typescript
@@ -53,6 +55,7 @@ export async function refreshSession(peerId: string): Promise<pb.ICafeSession |
5355
}
5456
return pb.CafeSession.decode(Buffer.from(result, 'base64'))
5557
}
58+
5659
/**
5760
* Deregister a remote Cafe.
5861
* ```typescript
@@ -62,6 +65,7 @@ export async function refreshSession(peerId: string): Promise<pb.ICafeSession |
6265
export async function deregister(id: string): Promise<void> {
6366
return TextileNode.deregisterCafe(id)
6467
}
68+
6569
/**
6670
* Check for offline messages on remote Cafe.
6771
* ```typescript

0 commit comments

Comments
 (0)