From aa26785c008a8c028415c783a00227c6fd606a05 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 12 Feb 2015 10:30:45 -0800
Subject: [PATCH] Reinclude SC provider for consistency.

// FREEBIE

Fixes #2461
---
 build.gradle                                           | 7 +++++++
 src/org/thoughtcrime/securesms/ApplicationContext.java | 1 +
 2 files changed, 8 insertions(+)

diff --git a/build.gradle b/build.gradle
index 0b287cfca5..d9ac8aa4be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,6 +53,7 @@ dependencies {
     compile ("com.doomonafireball.betterpickers:library:1.5.3") {
         exclude group: 'com.android.support', module: 'support-v4'
     }
+    compile 'com.madgag.spongycastle:prov:1.51.0.0'
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
 
     compile 'org.whispersystems:jobmanager:0.10.0'
@@ -94,6 +95,8 @@ dependencyVerification {
             'org.whispersystems:axolotl-android:7617256d05aaecd7b5475cd55e42773d7079167a22ca48512bcb0f84f8473cc9',
             'com.android.support:support-v4:703572d3015a088cc5604b7e38885af3d307c829d0c5ceaf8654ff41c71cd160',
             'com.android.support:support-annotations:fdee2354787ef66b268e75958de3f7f6c4f8f325510a6dac9f49c929f83a63de',
+            'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
+            'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
     ]
 }
 
@@ -101,6 +104,10 @@ android {
     compileSdkVersion 21
     buildToolsVersion '21.1.2'
 
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 19
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 1be73f7dea..d197acaa3d 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -74,6 +74,7 @@ public class ApplicationContext extends Application implements DependencyInjecto
 
 
   private void initializeRandomNumberFix() {
+    Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
     PRNGFixes.apply();
   }