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

Finished unit tests for SetupActivity and its Controller

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-05-04 21:48:13 +02:00
parent 80f79d9ee0
commit f855c9ea28
9 changed files with 176 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/system/AndroidSeedProvider.java
View File

@@ -34,7 +34,10 @@ class AndroidSeedProvider extends LinuxSeedProvider {
if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
ContentResolver contentResolver = appContext.getContentResolver();
out.writeUTF(Settings.Secure.getString(contentResolver, ANDROID_ID));
super.writeToEntropyPool(out);
String str = Settings.Secure.getString(contentResolver, ANDROID_ID);
if (str != null) {
out.writeUTF(str);
super.writeToEntropyPool(out);
}
}
}