Graduate to a rebased and gradle world.

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"

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 {

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']
+            }
+        }
+    }
+}

settings.gradle

@@ -0,0 +1 @@
+include ':library'

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.