From dd8e111b0b85de24af53f50d243344d8484ce739 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 21 Jan 2016 14:41:17 +0000
Subject: [PATCH] Add Settings.Secure.ANDROID_ID to entropy pool.
---
.../system/AndroidSeedProvider.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/briar-android/src/org/briarproject/system/AndroidSeedProvider.java b/briar-android/src/org/briarproject/system/AndroidSeedProvider.java
index 521f3d7586..c15e0b411a 100644
--- a/briar-android/src/org/briarproject/system/AndroidSeedProvider.java
+++ b/briar-android/src/org/briarproject/system/AndroidSeedProvider.java
@@ -1,12 +1,27 @@
package org.briarproject.system;
+import android.app.Application;
+import android.content.ContentResolver;
+import android.content.Context;
import android.os.Build;
+import android.provider.Settings;
import java.io.DataOutputStream;
import java.io.IOException;
+import javax.inject.Inject;
+
+import static android.provider.Settings.Secure.ANDROID_ID;
+
class AndroidSeedProvider extends LinuxSeedProvider {
+ private final Context appContext;
+
+ @Inject
+ AndroidSeedProvider(Application app) {
+ appContext = app.getApplicationContext();
+ }
+
@Override
void writeToEntropyPool(DataOutputStream out) throws IOException {
out.writeInt(android.os.Process.myPid());
@@ -14,6 +29,8 @@ class AndroidSeedProvider extends LinuxSeedProvider {
out.writeInt(android.os.Process.myUid());
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);
}
}
--
GitLab