Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 04:04:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move trust store to raw resource from asset.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-07-10 16:33:14 -07:00
parent 1ac06312a0
commit 26dadfcb7a
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
View File

@@ -6,6 +6,7 @@ import android.util.Base64;
import android.util.Log;
import com.google.thoughtcrimegson.Gson;
import org.whispersystems.textsecure.R;
import org.whispersystems.textsecure.Release;
import org.whispersystems.textsecure.directory.DirectoryDescriptor;
import org.whispersystems.textsecure.directory.NumberFilter;
@@ -191,8 +192,7 @@ public class PushServiceSocket {
private TrustManagerFactory initializeTrustManagerFactory(Context context) {
try {
AssetManager assetManager = context.getAssets();
InputStream keyStoreInputStream = assetManager.open("whisper.store");
InputStream keyStoreInputStream = context.getResources().openRawResource(R.raw.whisper);
KeyStore trustStore = KeyStore.getInstance("BKS");
trustStore.load(keyStoreInputStream, "whisper".toCharArray());