From 1ac32346c193d838c1e6a5ca7fa6e9f4d01b6119 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 12 Oct 2013 03:09:22 -0700
Subject: [PATCH] Graduate to a rebased and gradle world.

---
 AndroidManifest.xml                           |  2 +-
 build.gradle                                  |  4 +-
 library/build.gradle                          | 44 +++++++++++++++++++
 settings.gradle                               |  1 +
 .../securesms/ViewLocalIdentityActivity.java  |  2 +-
 5 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 library/build.gradle
 create mode 100644 settings.gradle

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9bbe2551b..cdeca242e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -75,7 +75,7 @@
         </activity>
 
     <activity android:name=".RegistrationProblemsActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
+              android:theme="@style/TextSecure.Light.Dialog"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".CountrySelectionActivity"
diff --git a/build.gradle b/build.gradle
index 6a73251b4..320a6c6dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,10 @@ repositories {
 
 dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
     compile 'com.android.support:support-v4:18.0.0'
-    compile 'org.whispersystems:gson:2.1'
     compile 'com.google.android.gcm:gcm-client:1.0.2'
+
+    compile project(':library')
 }
 
 android {
diff --git a/library/build.gradle b/library/build.gradle
new file mode 100644
index 000000000..2e36f7e12
--- /dev/null
+++ b/library/build.gradle
@@ -0,0 +1,44 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
+apply plugin: 'android-library'
+
+repositories {
+    mavenCentral()
+    maven {
+        url "https://raw.github.com/whispersystems/maven/master/gson/releases/"
+    }
+}
+
+dependencies {
+    compile 'com.google.protobuf:protobuf-java:2.4.1'
+    compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
+    compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
+    compile 'org.whispersystems:gson:2.1'
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion '17.0.0'
+
+    android {
+        sourceSets {
+            main {
+                manifest.srcFile 'AndroidManifest.xml'
+                java.srcDirs = ['src']
+                resources.srcDirs = ['src']
+                aild.srcDirs = ['src']
+                renderscript.srcDirs = ['src']
+                res.srcDirs = ['res']
+                assets.srcDirs = ['assets']
+            }
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..d8f14a134
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':library'
diff --git a/src/org/thoughtcrime/securesms/ViewLocalIdentityActivity.java b/src/org/thoughtcrime/securesms/ViewLocalIdentityActivity.java
index cc87d4316..03c27cad1 100644
--- a/src/org/thoughtcrime/securesms/ViewLocalIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/ViewLocalIdentityActivity.java
@@ -27,7 +27,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.whispersystems.textsecure.crypto.MasterSecret;
 
 /**
  * Activity that displays the local identity key and offers the option to regenerate it.