diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-09 12:46:06 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-09 12:48:20 +0100 |
| commit | 9e6fe0e215e32343b38cdf20080de209a31287dd (patch) | |
| tree | d4a8bf8aa9fc7caf06486bd2342ef28007329618 /app/src/test/java/se/leap | |
| parent | 73854e7fcdab77eaa408741b7353dea35b4803e1 (diff) | |
8827 - merge request discussions
* add NullPointer checks to EipFragment
* add Provider to DownloadFailedDialog
* remove unused code
* store certificates for pinning in SharedPreferences
Diffstat (limited to 'app/src/test/java/se/leap')
| -rw-r--r-- | app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java index ea7f9aae..fa5fab8c 100644 --- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java +++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java @@ -354,7 +354,6 @@ public class MockHelper { OkHttpClient mockedOkHttpClient = mock(OkHttpClient.class); when(mockClientGenerator.initCommercialCAHttpClient(any(JSONObject.class))).thenReturn(mockedOkHttpClient); when(mockClientGenerator.initSelfSignedCAHttpClient(anyString(), any(JSONObject.class))).thenReturn(mockedOkHttpClient); - when(mockClientGenerator.initSelfSignedCAHttpClient(any(JSONObject.class), anyString())).thenReturn(mockedOkHttpClient); return mockClientGenerator; } |