Merge pull request #383 from SilenceIM/new-brand-name

Change the name of SMSSecure

AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots"/>
 
     <permission android:name="org.smssecure.smssecure.ACCESS_SECRETS"
-                android:label="Access to SMSSecure Secrets"
+                android:label="Access to Silence Secrets"
                 android:protectionLevel="signature" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -41,9 +41,9 @@
                  android:supportsRtl="true"
                  tools:replace="android:allowBackup"
                  android:allowBackup="false"
-                 android:theme="@style/SMSSecure.LightTheme">
+                 android:theme="@style/Silence.LightTheme">
 
-    <meta-data android:name="org.smssecure.smssecure.mms.SMSSecureGlideModule"
+    <meta-data android:name="org.smssecure.smssecure.mms.SilenceGlideModule"
                android:value="GlideModule" />
 
     <activity android:name=".CountrySelectionActivity"
@@ -120,7 +120,7 @@
               android:launchMode="singleTask"
               android:taskAffinity=""
               android:excludeFromRecents="true"
-              android:theme="@style/SMSSecure.LightTheme.Popup"
+              android:theme="@style/Silence.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".MessageDetailsActivity"
@@ -151,19 +151,19 @@
     <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/SMSSecure.LightIntroTheme"
+              android:theme="@style/Silence.LightIntroTheme"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:label="@string/AndroidManifest__enter_passphrase"
               android:launchMode="singleTask"
-              android:theme="@style/SMSSecure.LightIntroTheme"
+              android:theme="@style/Silence.LightIntroTheme"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:theme="@style/SMSSecure.LightNoActionBar"
+              android:theme="@style/Silence.LightNoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -230,11 +230,11 @@
     </activity>
 
     <activity android:name=".RecipientPreferenceActivity"
-              android:theme="@style/SMSSecure.LightNoActionBar"
+              android:theme="@style/Silence.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".BlockedContactsActivity"
-              android:theme="@style/SMSSecure.LightTheme"
+              android:theme="@style/Silence.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <!-- this can never have launchMode singleTask or singleInstance! -->
@@ -344,5 +344,12 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".IntroScreenActivity$AppUpgradeReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+            <data android:scheme="package" />
+        </intent-filter>
+    </receiver>
+
 </application>
 </manifest>

BUILDING.md

@@ -1,20 +1,20 @@
-Building SMSSecure
-==================
+Building Silence
+================
 
 Basics
 ------
 
-SMSSecure uses [Gradle](http://gradle.org) to build the project and to maintain
+Silence uses [Gradle](http://gradle.org) to build the project and to maintain
 dependencies.
 
-Building SMSSecure
-------------------
+Building Silence
+----------------
 
-The following steps should help you (re)build SMSSecure from the command line.
+The following steps should help you (re)build Silence from the command line.
 
 1. Checkout the source somewhere on your filesystem with
 
-        git clone --recursive https://github.com/SMSSecure/SMSSecure.git
+        git clone --recursive https://github.com/SilenceIM/Silence.git
 
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed somewhere on your system.
 3. Ensure that the following packages are installed from the Android SDK manager:
@@ -44,8 +44,8 @@ Visual assets
 Sample command for generating our audio placeholder image:
 
 ```bash
-pngs_from_svg.py ic_audio.svg /path/to/SMSSecure/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/SMSSecure/res/ 150 --color #fff --opacity 1.00 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/Silence/res/ 150 --color #000 --opacity 0.54 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/Silence/res/ 150 --color #fff --opacity 1.00 --suffix _light
 ```
 
 
@@ -89,7 +89,7 @@ Setting up a development environment
 2. Make sure the "Android Support Repository" is installed in the Android Studio SDK.
 3. Make sure the latest "Android SDK build-tools" is installed in the Android Studio SDK.
 4. Create a new Android Studio project. from the Quickstart pannel (use File > Close Project to see it), choose "Checkout from Version Control" then "git".
-5. Paste the URL for the SMSSecure project when prompted (https://github.com/SMSSecure/SMSSecure.git).
+5. Paste the URL for the Silence project when prompted (https://github.com/SilenceIM/Silence.git).
 6. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 7. Default config options should be good enough.
 8. Project initialisation and build should proceed.

CHANGELOG.md

@@ -1,4 +1,4 @@
-# SMSSecure Changelog
+# Silence Changelog
 
 ### [0.13.2] - 2016-02-07
 - Fixed keyboard/focus regressions
@@ -122,28 +122,28 @@
 - Changed app name
 - Removed non-free libraries
 
- [0.13.2]: https://github.com/SMSSecure/SMSSecure/compare/v0.13.1...v0.13.2
- [0.13.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.13.0...v0.13.1
- [0.13.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.12.3...v0.13.0
- [0.12.3]: https://github.com/SMSSecure/SMSSecure/compare/v0.12.1...v0.12.3
- [0.12.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.11.3...v0.12.1
- [0.11.3]: https://github.com/SMSSecure/SMSSecure/compare/v0.11.1...v0.11.3
- [0.11.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.10.1...v0.11.1
- [0.10.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.9.0...v0.10.1
- [0.9.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.8.1...v0.9.0
- [0.8.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.8.0...v0.8.1
- [0.8.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.7.0...v0.8.0
- [0.7.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.6.0...v0.7.0
- [0.6.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.5.4...v0.6.0
- [0.5.4]: https://github.com/SMSSecure/SMSSecure/compare/v0.5.3...v0.5.4
- [0.5.3]: https://github.com/SMSSecure/SMSSecure/compare/v0.5.2...v0.5.3
- [0.5.2]: https://github.com/SMSSecure/SMSSecure/compare/v0.5.1...v0.5.2
- [0.5.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.4.2...v0.5.1
- [0.4.2]: https://github.com/SMSSecure/SMSSecure/compare/v0.4.1...v0.4.2
- [0.4.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.4.0...v0.4.1
- [0.4.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.3.3...v0.4.0
- [0.3.3]: https://github.com/SMSSecure/SMSSecure/compare/v0.3.2...v0.3.3
- [0.3.2]: https://github.com/SMSSecure/SMSSecure/compare/v0.3.1...v0.3.2
- [0.3.1]: https://github.com/SMSSecure/SMSSecure/compare/v0.3.0...v0.3.1
- [0.3.0]: https://github.com/SMSSecure/SMSSecure/compare/v0.2.0...v0.3.0
- [0.2.0]: https://github.com/SMSSecure/SMSSecure/compare/ac92fa6f5e1f86da833b38aa5955b685e1959846...v0.2.0
+ [0.13.2]: https://github.com/SilenceIM/Silence/compare/v0.13.1...v0.13.2
+ [0.13.1]: https://github.com/SilenceIM/Silence/compare/v0.13.0...v0.13.1
+ [0.13.0]: https://github.com/SilenceIM/Silence/compare/v0.12.3...v0.13.0
+ [0.12.3]: https://github.com/SilenceIM/Silence/compare/v0.12.1...v0.12.3
+ [0.12.1]: https://github.com/SilenceIM/Silence/compare/v0.11.3...v0.12.1
+ [0.11.3]: https://github.com/SilenceIM/Silence/compare/v0.11.1...v0.11.3
+ [0.11.0]: https://github.com/SilenceIM/Silence/compare/v0.10.1...v0.11.1
+ [0.10.1]: https://github.com/SilenceIM/Silence/compare/v0.9.0...v0.10.1
+ [0.9.0]: https://github.com/SilenceIM/Silence/compare/v0.8.1...v0.9.0
+ [0.8.1]: https://github.com/SilenceIM/Silence/compare/v0.8.0...v0.8.1
+ [0.8.0]: https://github.com/SilenceIM/Silence/compare/v0.7.0...v0.8.0
+ [0.7.0]: https://github.com/SilenceIM/Silence/compare/v0.6.0...v0.7.0
+ [0.6.0]: https://github.com/SilenceIM/Silence/compare/v0.5.4...v0.6.0
+ [0.5.4]: https://github.com/SilenceIM/Silence/compare/v0.5.3...v0.5.4
+ [0.5.3]: https://github.com/SilenceIM/Silence/compare/v0.5.2...v0.5.3
+ [0.5.2]: https://github.com/SilenceIM/Silence/compare/v0.5.1...v0.5.2
+ [0.5.1]: https://github.com/SilenceIM/Silence/compare/v0.4.2...v0.5.1
+ [0.4.2]: https://github.com/SilenceIM/Silence/compare/v0.4.1...v0.4.2
+ [0.4.1]: https://github.com/SilenceIM/Silence/compare/v0.4.0...v0.4.1
+ [0.4.0]: https://github.com/SilenceIM/Silence/compare/v0.3.3...v0.4.0
+ [0.3.3]: https://github.com/SilenceIM/Silence/compare/v0.3.2...v0.3.3
+ [0.3.2]: https://github.com/SilenceIM/Silence/compare/v0.3.1...v0.3.2
+ [0.3.1]: https://github.com/SilenceIM/Silence/compare/v0.3.0...v0.3.1
+ [0.3.0]: https://github.com/SilenceIM/Silence/compare/v0.2.0...v0.3.0
+ [0.2.0]: https://github.com/SilenceIM/Silence/compare/ac92fa6f5e1f86da833b38aa5955b685e1959846...v0.2.0

CONTRIBUTING.md

@@ -7,12 +7,12 @@ Please submit your corrections there.
 ## Submitting bug reports
 
 1. Search our issues first to make sure this is not a duplicate.
-2. (Optional) Search [TextSecure's issues](https://github.com/WhisperSystems/TextSecure/issues).
+2. (Optional) Search [Signal's issues](https://github.com/WhisperSystems/Signal-Android/issues).
 3. Open an issue with:
   * Device and app information
     * What's your device?
     * What Android version is it running?
-    * What version and build ID of SMSSecure do you have?
+    * What version and build ID of Silence do you have?
   * Upstream bug (if any)
   * App state
     * What are the relevant preferences that you have set that may be related to the issue?

NOTICE

@@ -1,6 +1,6 @@
-SMSSecure provides encrypted SMS messages for Android.
-https://github.com/SMSSecure/SMSSecure
-https://smssecure.org
+Silence (formerly SMSSecure) provides encrypted SMS messages for Android.
+https://github.com/SilenceIM/Silence
+https://silence.im
 
 
 Based on TextSecure v2.6.4 (March 12th, 2015)

README.md

@@ -1,42 +1,42 @@
-# SMSSecure [![Build Status](https://travis-ci.org/SMSSecure/SMSSecure.svg?branch=master)](https://travis-ci.org/SMSSecure/SMSSecure)
+# Silence [![Build Status](https://travis-ci.org/SilenceIM/Silence.svg?branch=master)](https://travis-ci.org/SilenceIM/Silence)
 
-[SMSSecure](https://smssecure.org) is an SMS/MMS application that allows you to protect your privacy while communicating with friends.
+[Silence](https://silence.im) is an SMS/MMS application that allows you to protect your privacy while communicating with friends.
 
-Using SMSSecure, you can send SMS messages and share media or attachments with complete privacy.
+Using Silence, you can send SMS messages and share media or attachments with complete privacy.
 
 Features:
-* Easy. SMSSecure works like any other SMS application. There's nothing to sign up for and no new service your friends need to join.
-* Reliable. SMSSecure communicates using encrypted SMS messages. No servers or internet connection required.
-* Private. SMSSecure uses the TextSecure encryption protocol to provide privacy for every message, every time.
+* Easy. Silence works like any other SMS application. There's nothing to sign up for and no new service your friends need to join.
+* Reliable. Silence communicates using encrypted SMS messages. No servers or internet connection required.
+* Private. Silence uses the Axolotl encryption protocol to provide privacy for every message, every time.
 * Safe. All messages are encrypted locally, so if your phone is lost or stolen, your messages are protected.
-* Open Source. SMSSecure is Free and Open Source, enabling anyone to verify its security by auditing the code.
+* Open Source. Silence is Free and Open Source, enabling anyone to verify its security by auditing the code.
 
 
 ## Project goals
 
-This is a fork of [TextSecure](https://github.com/WhisperSystems/TextSecure) that aims to keep the SMS encryption that TextSecure removed [for a variety of reasons](https://whispersystems.org/blog/goodbye-encrypted-sms/).
+This is a fork of [TextSecure](https://github.com/WhisperSystems/TextSecure) (now Signal) that aims to keep the SMS encryption that TextSecure removed [for a variety of reasons](https://whispersystems.org/blog/goodbye-encrypted-sms/).
 
-SMSSecure focuses on SMS and MMS. This fork aims to:
+Silence focuses on SMS and MMS. This fork aims to:
 
 * Keep SMS/MMS encryption
-* Drop Google services dependencies (push messages are not available in SMSSecure)
+* Drop Google services dependencies (push messages are not available in Silence)
 * Integrate upstream bugfixes and patches from TextSecure
 
-## Migrating from TextSecure to SMSSecure
+## Migrating from TextSecure to Silence
 
 * In TextSecure, export a plaintext backup. Warning: the backup will **not** be encrypted.
-* Install SMSSecure.
-* In SMSSecure, import the plaintext backup (this will import the TextSecure backup if no SMSSecure backup is found).
+* Install Silence.
+* In Silence, import the plaintext backup (this will import the TextSecure backup if no Silence backup is found).
 * If TextSecure v2.6.4 or earlier is installed, update or uninstall it so it doesn't conflict (can cause errors with key exchanges).
-* Enjoy SMSSecure!
+* Enjoy Silence!
 
 Note: You will have to start new secured sessions with your contacts.
 
 # Contributing
 
-See [CONTRIBUTING.md](https://github.com/SMSSecure/SMSSecure/blob/master/CONTRIBUTING.md) for how to contribute code, translations, or bug reports.
+See [CONTRIBUTING.md](https://github.com/SilenceIM/Silence/blob/master/CONTRIBUTING.md) for how to contribute code, translations, or bug reports.
 
-Instructions on how to setup a development environment and build SMSSecure can be found in [BUILDING.md](https://github.com/SMSSecure/SMSSecure/blob/master/BUILDING.md).
+Instructions on how to setup a development environment and build Silence can be found in [BUILDING.md](https://github.com/SilenceIM/Silence/blob/master/BUILDING.md).
 
 # Help
 ## Documentation
@@ -45,7 +45,7 @@ Looking for documentation? Check out the wiki of the original project:
 https://github.com/WhisperSystems/TextSecure/wiki
 
 ## Chat
-Have a question? Want to help out? Join our IRC channel: [#SMSSecure on Freenode](https://webchat.freenode.net/?channels=SMSSecure) or follow [@SMSSecure_](https://twitter.com/SMSSecure_) on Twitter.
+Have a question? Want to help out? Join our IRC channel: [#Silence on Freenode](https://webchat.freenode.net/?channels=Silence) or follow [@SilenceIM](https://twitter.com/SilenceIM) on Twitter.
 
 # Legal
 ## Cryptography Notice

res/drawable-v21/conversation_list_item_read_background.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/smssecure_primary">
+        android:color="@color/silence_primary">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
             <item android:drawable="@color/conversation_list_item_background_read_light" />
         </selector>
     </item>

res/drawable-v21/conversation_list_item_read_background_dark.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/smssecure_primary">
+        android:color="@color/silence_primary">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
             <item android:drawable="@color/conversation_list_item_background_read_dark" />
         </selector>
     </item>

res/drawable-v21/conversation_list_item_unread_background.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/smssecure_primary">
+        android:color="@color/silence_primary">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
             <item android:drawable="@color/conversation_list_item_background_unread_light" />
         </selector>
     </item>

res/drawable-v21/conversation_list_item_unread_background_dark.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/smssecure_primary">
+        android:color="@color/silence_primary">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
             <item android:drawable="@color/conversation_list_item_background_unread_dark" />
         </selector>
     </item>

res/drawable/conversation_item_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
+    <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
 </selector>

res/drawable/conversation_list_item_read_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/smssecure_primary_alpha33" android:state_pressed="true" />
+    <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
+    <item android:drawable="@color/silence_primary_alpha33" android:state_pressed="true" />
     <item android:drawable="@color/conversation_list_item_background_read_light" />
 </selector>

res/drawable/conversation_list_item_read_background_dark.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/smssecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/smssecure_primary_alpha33" android:state_pressed="true" />
+    <item android:drawable="@color/silence_primary_alpha33" android:state_selected="true" />
+    <item android:drawable="@color/silence_primary_alpha33" android:state_pressed="true" />
     <item android:drawable="@color/conversation_list_item_background_read_dark" />
 </selector>