Modified readme to talk about Websockets reborn specifically

.github/ISSUE_TEMPLATE.md

@@ -1,33 +1,41 @@
-<!--
-Please note this is a bug tracker, not a support forum. If you need support, please use
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to get all the necessary data to fix your issue.
+You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
+
+Before we begin, please note that this tracker is only for issues, not questions or comments.
+
+If you are looking for support, please see our support center instead:
 http://support.whispersystems.org/
 or email support@whispersystems.org
 
-Delete any sections that aren't relevant.
--->
+Let's begin with a checklist: replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 
-<!-- mark with x between the [ ] -->
 I have:
 - [ ] searched open and closed issues for duplicates
 - [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
 
+----------------------------------------
+
 ### Bug description
+Describe here the issue that you are experiencing.
 
 ### Steps to reproduce
-- add your steps here
-- as a list
-- using hyphens
+- using hyphens as bullet points
+- list the steps
+- that reproduce the bug
 
-### Screenshots
-<!-- Drag and drop images here, or post a link -->
+**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
+**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
 
-### Device info
-<!-- Replace examples with your info -->
- **Model:** Manufacturer Model XVI
+### Screenshots
+<!-- you can drag and drop images below -->
 
- **Android version:** 0.0.0
 
- **Signal version:** 0.0.0
+### Device info
+<!-- replace the examples with your info -->
+**Device:** Manufacturer Model XVI
+**Android version:** 0.0.0
+**Signal version:** 0.0.0
 
 ### Link to debug log
+<!-- immediately after the bug has happened capture a debug log via Signal's advanced settings and paste the link below -->
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,23 @@
-<!-- You can remove this section if you have contributed before -->
+<!-- You can remove this first section if you have contributed before -->
 ### First time contributor checklist
-<!-- mark with x between the brackets -->
+<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I have read [how to contribute](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md) to this project
-- [ ] I have signed the [Contributor Licence Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
-<!-- mark with x between the brackets -->
+<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines)
 - [ ] I have tested my contribution on these devices:
  * Device A, Android X.Y.Z
  * Device B, Android Z.Y
+ * Virtual device W, Android Y.Y.Z
 - [ ] My contribution is fully baked and ready to be merged as is
-- [ ] I have made the choice whether I want the Bithub reward or not by omitting or adding the word `FREEBIE` in my commit message
+- [ ] I ensure that all the open issues my contribution fixes are mentioned in the commit message of my first commit using the `Fixes #1234` [syntax](https://help.github.com/articles/closing-issues-via-commit-messages/)
+- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in the commit message of my first commit
 
 ----------
 
 ### Description
+<!--
+Describe briefly what your pull request proposes to fix. Especially if you have more than one commit, it is helpful to give a summary of what your contribution as a whole is trying to solve.
+Also, please describe shortly how you tested that your fix actually works.
+-->

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "libs/libtextsecure-java"]
+	path = libs/libtextsecure-java
+	url = https://github.com/LibreSignal/libtextsecure-java.git
+[submodule "libs/android-support-v4-preferencefragment"]
+	path = libs/android-support-v4-preferencefragment
+	url = https://github.com/kolavar/android-support-v4-preferencefragment.git
+[submodule "libs/org.w3c.dom"]
+	path = libs/org.w3c.dom
+	url = https://github.com/SMSSecure/org.w3c.dom.git
+[submodule "libs/ShortcutBadger"]
+	path = libs/ShortcutBadger
+	url = https://github.com/WhisperSystems/ShortcutBadger.git
+[submodule "libs/PhotoView"]
+	path = libs/PhotoView
+	url = https://github.com/chrisbanes/PhotoView.git

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="185"
-      android:versionName="3.12.0">
+      android:versionCode="221"
+      android:versionName="3.25.3">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 
@@ -97,16 +97,12 @@
                  android:allowBackup="false"
                  android:theme="@style/TextSecure.LightTheme">
 
-    <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
-
-    <meta-data android:name="com.google.android.gms.version"
-               android:value="@integer/google_play_services_version" />
-
     <meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
                android:value="GlideModule" />
 
+    <meta-data android:name="com.google.android.gms.car.application"
+               android:resource="@xml/automotive_app_desc" />
+
     <activity android:name="org.thoughtcrime.redphone.RedPhone"
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
@@ -179,9 +175,13 @@
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
+            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
         </intent-filter>
 
-
+        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
+            android:resource="@drawable/icon" />
+        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
+            android:resource="@drawable/icon" />
 
     </activity-alias>
 
@@ -262,19 +262,16 @@
           android:windowSoftInputMode="stateHidden"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ViewIdentityActivity"
-              android:label="@string/AndroidManifest__public_identity_key"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ViewLocalIdentityActivity"
+    <activity android:name=".giph.ui.GiphyActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphraseChangeActivity"
               android:label="@string/AndroidManifest__change_passphrase"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".VerifyIdentityActivity"
-              android:label="@string/AndroidManifest__verify_identity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ApplicationPreferencesActivity"
@@ -288,7 +285,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceActivity"
-               android:label="@string/AndroidManifest_manage_linked_devices"
+               android:label="@string/AndroidManifest__linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".LogSubmitActivity"
@@ -304,6 +301,7 @@
 
     <activity android:name=".MediaOverviewActivity"
               android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DummyActivity"
@@ -361,6 +359,15 @@
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".scribbles.ScribbleActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".scribbles.StickerSelectActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
 
     <service android:enabled="true" android:name="org.thoughtcrime.redphone.RedPhoneService"/>
@@ -454,6 +461,21 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"
@@ -497,5 +519,20 @@
         </intent-filter>
     </receiver>
 
+    <receiver
+        android:name=".service.PanicResponderListener"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="info.guardianproject.panic.action.TRIGGER" />
+        </intent-filter>
+    </receiver>
+
+    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
+    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
+
 </application>
 </manifest>

BUILDING.md

@@ -1,33 +1,40 @@
-Building Signal
+Building LibreSignal
 ===============
 
 Basics
 ------
 
-Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.  However, you needn't install it yourself; the
-"gradle wrapper" `gradlew`, mentioned below, will do that for you.
+LibreSignal uses [Gradle](http://gradle.org) to build the project and to maintain dependencies.  However, you needn't install it yourself; the "gradle wrapper" `gradlew`, mentioned below, will do that for you.
 
-Building Signal
+Building LibreSignal
 ---------------
 
-The following steps should help you (re)build Signal from the command line.
+The following steps should help you (re)build LibreSignal from the command line.
 
-1. Checkout the Signal-Android project source with the command:
+1. Checkout the LibreSignal project source and all submodules with the command (`git` 1.6.5 or higher):
+
+        git clone --recursive https://github.com/LibreSignal/LibreSignal.git
 
-        git clone https://github.com/WhisperSystems/Signal-Android.git
 
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
+2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) and [Android NDK](https://developer.android.com/ndk/index.html) installed.
 3. Ensure that the following packages are installed from the Android SDK manager:
     * Android SDK Build Tools
     * SDK Platform (API level 22)
     * Android Support Repository
-    * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
+4. Create a local.properties file at the root of your source checkout and add the sdk.dir and ndk.dir entries to it.  For example:
 
-        sdk.dir=/Application/android-sdk-macosx
+        sdk.dir=/home/username/android-sdk
+        ndk.dir=/home/username/android-ndk
 
-5. Execute Gradle:
+5. Compile NDK code:
+
+        ndk-build --directory=jni
+
+6. Gradle clean:
+
+        ./gradlew clean
+
+7. Gradle build:
 
         ./gradlew build
 
@@ -39,8 +46,8 @@ Source assets tend to be large binary blobs, which are best stored outside of gi
 Sample command for generating our audio placeholder image:
 
 ```bash
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/LibreSignal/res/ 150 --color #000 --opacity 0.54 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/LibreSignal/res/ 150 --color #fff --opacity 1.00 --suffix _light
 ```
 
 Setting up a development environment
@@ -53,7 +60,7 @@ Setting up a development environment
 3. From the Quickstart panel, choose "Configure" then "SDK Manager".
 4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
 5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/WhisperSystems/Signal-Android.git).
+6. Paste the URL for the LibreSignal-Android project when prompted (https://github.com/LibreSignal/LibreSignal.git).
 7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 9. Default config options should be good enough.
 9. Project initialisation and build should proceed.
@@ -62,11 +69,3 @@ Contributing code
 -----------------
 
 Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Mailing list
-------------
-
-Development discussion happens on the whispersystems mailing list.
-[To join](https://lists.riseup.net/www/info/whispersystems)
-Send emails to whispersystems@lists.riseup.net
-