Skip to content

Commit 0fe0b12

Browse files
committed
Modified a logic on CreateMessageFragment. Added an ability import a contact public key or remove the contact if API is not available.| #125.
1 parent e4afe4c commit 0fe0b12

22 files changed

+45
-34
lines changed

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/ApiHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public class ApiHelper {
4040

4141
private ApiHelper(Context context) {
4242
OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder()
43-
.connectTimeout(2, TimeUnit.MINUTES)
44-
.readTimeout(2, TimeUnit.MINUTES)
45-
.writeTimeout(2, TimeUnit.MINUTES);
43+
.connectTimeout(10, TimeUnit.SECONDS)
44+
.readTimeout(10, TimeUnit.SECONDS)
45+
.writeTimeout(10, TimeUnit.SECONDS);
4646

4747
okHttpClientBuilder.addInterceptor(new ApiVersionInterceptor());
4848

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/ApiName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
*/
1717
public enum ApiName {
18-
/*attester.cryptup.io*/
18+
/*attester.flowcrypt.com*/
1919
POST_TEST_WELCOME,
2020
POST_INITIAL_REQUEST,
2121
POST_INITIAL_CONFIRM,

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/ApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public interface ApiService {
2727

2828
/**
29-
* This method create a Call object for the API "https://attester.cryptup.io/lookup/email"
29+
* This method create a Call object for the API "https://attester.flowcrypt.com/lookup/email"
3030
*
3131
* @param postLookUpEmailModel POJO model for requests
3232
* @return <tt>Call<LookUpEmailResponse></tt>

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/InitialConfirmRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.InitialConfirmModel;
1212

1313
/**
14-
* This class describes a request to the https://attester.cryptup.io/initial/confirm API.
14+
* This class describes a request to the https://attester.flowcrypt.com/initial/confirm API.
1515
* <p>
1616
* <code>POST /initial/confirm {
1717
* [voluntary] "signed_message" (<type 'str'>) # Signed attest packet if attesting first time

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/InitialRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.InitialRequestModel;
1212

1313
/**
14-
* This class describes a request to the https://attester.cryptup.io/initial/request API.
14+
* This class describes a request to the https://attester.flowcrypt.com/initial/request API.
1515
* <p>
1616
* <code>POST /initial/request {
1717
* "email" (<type 'str'>) # email to use pubkey for

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/LookUpEmailRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.PostLookUpEmailModel;
1212

1313
/**
14-
* This class describes the request to the API "https://attester.cryptup.io/lookup/email"
14+
* This class describes the request to the API "https://attester.flowcrypt.com/lookup/email"
1515
*
1616
* @author DenBond7
1717
* Date: 24.04.2017

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/ReplaceConfirmRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.ReplaceConfirmModel;
1212

1313
/**
14-
* This class describes a request to the https://attester.cryptup.io/replace/confirm API.
14+
* This class describes a request to the https://attester.flowcrypt.com/replace/confirm API.
1515
* <p>
1616
* <code>POST /replace/confirm {
1717
* "signed_message" (<type 'str'>) # signed confirm_replace packet (using new/replacement key)

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/ReplaceRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.ReplaceRequestModel;
1212

1313
/**
14-
* This class describes a request to the https://attester.cryptup.io/replace/request API.
14+
* This class describes a request to the https://attester.flowcrypt.com/replace/request API.
1515
* <p>
1616
* <code>POST /replace/request {
1717
* "signed_message" (<type 'str'>) # signed request_replace packet (using old/original key)

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/attester/TestWelcomeRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.flowcrypt.email.api.retrofit.request.model.TestWelcomeModel;
1212

1313
/**
14-
* This class describes a request to the https://attester.cryptup.io/test/welcome API.
14+
* This class describes a request to the https://attester.flowcrypt.com/test/welcome API.
1515
* <p>
1616
* <code>POST /test/welcome {
1717
* "email" (<type 'str'>) # email to send a welcome to

FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/model/InitialConfirmModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.google.gson.annotations.SerializedName;
1313

1414
/**
15-
* The request model for the https://attester.cryptup.io/initial/confirm API.
15+
* The request model for the https://attester.flowcrypt.com/initial/confirm API.
1616
*
1717
* @author Denis Bondarenko
1818
* Date: 12.07.2017

0 commit comments

Comments
 (0)