diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c08052c43b..0466db7e71 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,12 +3,9 @@ You can also preview your report before submitting it. You may remove sections t Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests. -If you would like to discuss a new feature or submit suggestions, please visit the community forum: -https://community.signalusers.org -If you are looking for support, please visit our support center: -https://support.signal.org/ -or email support@signal.org +If you are looking for support, please file an issue or: +or email team@loki.network Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. --> @@ -26,11 +23,11 @@ Describe here the issue that you are experiencing. - list the steps - that reproduce the bug -**Actual result:** +**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour) -**Expected result:** +**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour) @@ -48,6 +45,3 @@ Describe here what should happen after you run the steps above (i.e. what would **Session version:** 0.0.0 ### Link to debug log - - - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 543e006459..4e2e4b5310 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,12 +1,8 @@ ### First time contributor checklist -- [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project -- [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/) - ### Contributor checklist -- [ ] I am following the [Code Style Guidelines](https://github.com/signalapp/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 diff --git a/.gitignore b/.gitignore index a918936f20..191fbe6f50 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ jni/libspeex/.deps/ pkcs11.password fabric.properties play +google-services.json diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bfa2c456dc..df2bebd0b5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -47,6 +47,7 @@ + @@ -112,6 +113,9 @@ android:name="org.thoughtcrime.securesms.loki.redesign.activities.DisplayNameActivity" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize" /> + + + + + + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index b48217186e..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,89 +0,0 @@ -# Contributing to Signal Android - -Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors. - - -## Development Ideology - -Truths which we believe to be self-evident: - -1. **The answer is not more options.** If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere. -1. **The user doesn't know what a key is.** We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible. -1. **There are no power users.** The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them. -1. **If it's "like PGP," it's wrong.** PGP is our guide for what not to do. -1. **It's an asynchronous world.** Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message. -1. **There is no such thing as time.** Protocol ideas that require synchronized clocks are doomed to failure. - - -## Translations - -Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/signalapp/signal-android/). - - -## Issues - -### Useful bug reports -1. Please search both open and closed issues to make sure your bug report is not a duplicate. -1. Read the [guide to submitting useful bug reports](https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug. - -### The issue tracker is for bugs, not feature requests -The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the Android client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly. - -### Send support questions to support -You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker. - -### GitHub is not a generic discussion forum -Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category. - -### Don't bump issues -Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-Android/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add. - -### Open issues - -#### If it's open, it's tracked -The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues. - -### Closed issues - -#### "My issue was closed without giving a reason!" -Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues. - - -## Pull requests - -### Smaller is better -Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop). - -Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code. - -### Sign the Contributor License Agreement (CLA) -You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged. - -### Follow the Code Style Guidelines -Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request. - -### Submit finished and well-tested pull requests -Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted. - -### Merging can sometimes take a while -If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/). - - -## How can I contribute? -There are several other ways to get involved: -* Help new users learn about Signal. - * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/). - * Redirect non-bug discussions to the [community forum](https://community.signalusers.org). -* Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki). -* Join the community of volunteer translators on Transifex: - * [Android](https://www.transifex.com/signalapp/signal-android/) - * [iOS](https://www.transifex.com/signalapp/signal-ios/) - * [Desktop](https://www.transifex.com/signalapp/signal-desktop/) -* Find and mark duplicate issues. -* Try to reproduce issues and help with troubleshooting. -* Discover solutions to open issues and post any relevant findings. -* Test other people's pull requests. -* Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/). -* Share Signal with your friends and family. - -Signal is made for you. Thank you for your feedback and support. diff --git a/build.gradle b/build.gradle index 41e2ac5d37..392ad467f4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,8 @@ buildscript { ext.kovenant_version = "3.3.0" ext.identicon_version = "v11" ext.rss_parser_version = "2.0.4" + ext.google_services_version = "4.3.3" + ext.firebase_messaging_version = "18.0.0" repositories { mavenLocal() @@ -16,6 +18,7 @@ buildscript { classpath "com.android.tools.build:gradle:$gradle_version" classpath files('libs/gradle-witness.jar') classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.google.gms:google-services:$google_services_version" } } @@ -24,6 +27,7 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' apply plugin: 'witness' apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.gms.google-services' repositories { mavenLocal() @@ -87,6 +91,8 @@ dependencies { implementation 'android.arch.lifecycle:extensions:1.1.1' implementation 'android.arch.lifecycle:common-java8:1.1.1' + implementation "com.google.firebase:firebase-messaging:$firebase_messaging_version" + implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1' implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1' @@ -184,8 +190,8 @@ dependencies { implementation "com.github.ybq:Android-SpinKit:1.4.0" } -def canonicalVersionCode = 48 -def canonicalVersionName = "1.0.11" +def canonicalVersionCode = 49 +def canonicalVersionName = "1.1.0" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, diff --git a/res/drawable/pn_option_background.xml b/res/drawable/pn_option_background.xml new file mode 100644 index 0000000000..b43e8de341 --- /dev/null +++ b/res/drawable/pn_option_background.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/pn_option_background_deselect_transition.xml b/res/drawable/pn_option_background_deselect_transition.xml new file mode 100644 index 0000000000..7fcb8e1160 --- /dev/null +++ b/res/drawable/pn_option_background_deselect_transition.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/pn_option_background_select_transition.xml b/res/drawable/pn_option_background_select_transition.xml new file mode 100644 index 0000000000..21c58cf71d --- /dev/null +++ b/res/drawable/pn_option_background_select_transition.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/pn_option_background_selected.xml b/res/drawable/pn_option_background_selected.xml new file mode 100644 index 0000000000..56d1ed983a --- /dev/null +++ b/res/drawable/pn_option_background_selected.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml new file mode 100644 index 0000000000..8edc9267df --- /dev/null +++ b/res/layout-sw400dp/activity_pn_mode.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +