Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'AndroidX' into 'master'

Browse Source 
AndroidX Migration

See merge request briar/briar!1176
This commit is contained in:
akwizgran
2019-11-07 15:40:19 +00:00
parent b4e0d3b982 088ca01eb3
commit 9d72fca2a7
342 changed files with 2239 additions and 2148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java
View File

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.Bytes;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.system.Clock;
import org.briarproject.bramble.system.SystemClock;
import org.briarproject.bramble.test.ArrayClock;
import org.briarproject.bramble.test.BrambleTestCase;
import org.junit.Test;
@@ -11,8 +12,6 @@ import java.util.HashSet;
import java.util.Set;
import static junit.framework.TestCase.assertTrue;
import org.briarproject.bramble.test.ArrayClock;
import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.junit.Assert.assertEquals;