Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Add Settings.Secure.ANDROID_ID to entropy pool.

Browse Source
This commit is contained in:
akwizgran
2016-01-21 14:41:17 +00:00
parent d33dbca25a
commit dd8e111b0b
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,27 @@
package org.briarproject.system; package org.briarproject.system;
import android.app.Application;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Build; import android.os.Build;
import android.provider.Settings;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import javax.inject.Inject;
import static android.provider.Settings.Secure.ANDROID_ID;
class AndroidSeedProvider extends LinuxSeedProvider { class AndroidSeedProvider extends LinuxSeedProvider {
private final Context appContext;
@Inject
AndroidSeedProvider(Application app) {
appContext = app.getApplicationContext();
}
@Override @Override
void writeToEntropyPool(DataOutputStream out) throws IOException { void writeToEntropyPool(DataOutputStream out) throws IOException {
out.writeInt(android.os.Process.myPid()); out.writeInt(android.os.Process.myPid());
@@ -14,6 +29,8 @@ class AndroidSeedProvider extends LinuxSeedProvider {
out.writeInt(android.os.Process.myUid()); out.writeInt(android.os.Process.myUid());
if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT); if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
if (Build.SERIAL != null) out.writeUTF(Build.SERIAL); if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
ContentResolver contentResolver = appContext.getContentResolver();
out.writeUTF(Settings.Secure.getString(contentResolver, ANDROID_ID));
super.writeToEntropyPool(out); super.writeToEntropyPool(out);
} }
} }